refactor: Simplify test setup using a common CMake function

Author: shuxu.li

test/CMakeLists.txt

@@ -28,19 +28,20 @@ set(ICEBERG_TEST_RESOURCES "${CMAKE_SOURCE_DIR}/test/resources")
 configure_file("${CMAKE_SOURCE_DIR}/test/test_config.h.in"
                "${CMAKE_BINARY_DIR}/iceberg/test/test_config.h")
 
-function(iceberg_add_test test_name)
+function(add_iceberg_test test_name)
+  set(options USE_BUNDLE)
+  set(oneValueArgs)
+  set(multiValueArgs SOURCES)
   cmake_parse_arguments(ARG
-                        "USE_BUNDLE"
-                        "INCLUDE_DIR"
-                        "SRCS"
+                        "${options}"
+                        "${oneValueArgs}"
+                        "${multiValueArgs}"
                         ${ARGN})
 
   add_executable(${test_name})
-  if(ARG_INCLUDE_DIR)
-    target_include_directories(${test_name} PRIVATE "${ARG_INCLUDE_DIR}")
-  endif()
+  target_include_directories(${test_name} PRIVATE "${CMAKE_BINARY_DIR}")
 
-  target_sources(${test_name} PRIVATE ${ARG_SRCS})
+  target_sources(${test_name} PRIVATE ${ARG_SOURCES})
 
   if(ARG_USE_BUNDLE)
     target_link_libraries(${test_name} PRIVATE iceberg_bundle_static GTest::gtest_main
@@ -53,8 +54,8 @@ function(iceberg_add_test test_name)
   add_test(NAME ${test_name} COMMAND ${test_name})
 endfunction()
 
-iceberg_add_test(schema_test
-                 SRCS
+add_iceberg_test(schema_test
+                 SOURCES
                  name_mapping_test.cc
                  schema_test.cc
                  schema_field_test.cc
@@ -67,58 +68,50 @@ iceberg_add_test(schema_test
                  snapshot_test.cc
                  schema_util_test.cc)
 
-iceberg_add_test(table_test
-                 INCLUDE_DIR
-                 "${CMAKE_BINARY_DIR}"
-                 SRCS
+add_iceberg_test(table_test
+                 SOURCES
                  test_common.cc
                  json_internal_test.cc
                  table_test.cc
                  schema_json_test.cc)
 
-iceberg_add_test(expression_test SRCS expression_test.cc literal_test.cc)
+add_iceberg_test(expression_test SOURCES expression_test.cc literal_test.cc)
 
-iceberg_add_test(json_serde_test
-                 INCLUDE_DIR
-                 "${CMAKE_BINARY_DIR}"
-                 SRCS
+add_iceberg_test(json_serde_test
+                 SOURCES
                  test_common.cc
                  json_internal_test.cc
                  metadata_serde_test.cc
                  schema_json_test.cc)
 
-iceberg_add_test(util_test
-                 SRCS
+add_iceberg_test(util_test
+                 SOURCES
                  formatter_test.cc
                  config_test.cc
                  visit_type_test.cc)
 
 if(ICEBERG_BUILD_BUNDLE)
-  iceberg_add_test(avro_test
+  add_iceberg_test(avro_test
                    USE_BUNDLE
-                   INCLUDE_DIR
-                   "${CMAKE_BINARY_DIR}"
-                   SRCS
+                   SOURCES
                    avro_data_test.cc
                    avro_test.cc
                    avro_schema_test.cc
                    avro_stream_test.cc
                    manifest_list_reader_test.cc
                    test_common.cc)
 
-  iceberg_add_test(arrow_test
+  add_iceberg_test(arrow_test
                    USE_BUNDLE
-                   SRCS
+                   SOURCES
                    arrow_test.cc
                    arrow_fs_file_io_test.cc
                    metadata_io_test.cc
                    gzip_decompress_test.cc)
 
-  iceberg_add_test(catalog_test
+  add_iceberg_test(catalog_test
                    USE_BUNDLE
-                   INCLUDE_DIR
-                   "${CMAKE_BINARY_DIR}"
-                   SRCS
+                   SOURCES
                    test_common.cc
                    in_memory_catalog_test.cc)
 endif()