apache · Fokko · Sep 30, 2025 · Sep 25, 2025 · Sep 29, 2025
diff --git a/.github/.licenserc.yaml b/.github/.licenserc.yaml
@@ -30,6 +30,6 @@ header:
     - 'NOTICE'
     - 'src/iceberg/expected.h'
     - 'src/iceberg/util/murmurhash3_internal.*'
-    - 'test/resources/**'
+    - 'src/iceberg/test/resources/**'
 
   comment: on-failure
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -33,7 +33,7 @@ repos:
     rev: v20.1.8
     hooks:
       - id: clang-format
-        exclude: ^test/resources/.*\.json$
+        exclude: ^src/iceberg/test/resources/.*\.json$
 
   - repo: https://github.com/cheshirekow/cmake-format-precommit
     rev: v0.6.10

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -66,11 +66,9 @@ include(IcebergSanitizer)
 include(IcebergThirdpartyToolchain)
 include(GenerateExportHeader)
 
-add_subdirectory(src)
-
 if(ICEBERG_BUILD_TESTS)
   enable_testing()
-  add_subdirectory(test)
 endif()
 
+add_subdirectory(src)
 install(FILES LICENSE NOTICE DESTINATION ${ICEBERG_INSTALL_DOCDIR})
diff --git a/src/iceberg/CMakeLists.txt b/src/iceberg/CMakeLists.txt
@@ -182,3 +182,7 @@ if(ICEBERG_BUILD_BUNDLE)
 endif()
 
 iceberg_install_cmake_package(Iceberg iceberg_targets)
+
+if(ICEBERG_BUILD_TESTS)
+  add_subdirectory(test)
+endif()
diff --git a/test/CMakeLists.txt → src/iceberg/test/CMakeLists.txt b/test/CMakeLists.txt → src/iceberg/test/CMakeLists.txt
@@ -23,10 +23,9 @@ fetchcontent_declare(googletest
                      GTest)
 fetchcontent_makeavailable(googletest)
 
-set(ICEBERG_TEST_RESOURCES "${CMAKE_SOURCE_DIR}/test/resources")
+set(ICEBERG_TEST_RESOURCES "${CMAKE_SOURCE_DIR}/src/iceberg/test/resources")
 
-configure_file("${CMAKE_SOURCE_DIR}/test/test_config.h.in"
-               "${CMAKE_BINARY_DIR}/iceberg/test/test_config.h")
+configure_file("test_config.h.in" "test_config.h")
 
 function(add_iceberg_test test_name)
   set(options USE_BUNDLE)

diff --git a/test/arrow_fs_file_io_test.cc → src/iceberg/test/arrow_fs_file_io_test.cc b/test/arrow_fs_file_io_test.cc → src/iceberg/test/arrow_fs_file_io_test.cc
diff --git a/test/arrow_test.cc → src/iceberg/test/arrow_test.cc b/test/arrow_test.cc → src/iceberg/test/arrow_test.cc
diff --git a/test/avro_data_test.cc → src/iceberg/test/avro_data_test.cc b/test/avro_data_test.cc → src/iceberg/test/avro_data_test.cc
diff --git a/test/avro_schema_test.cc → src/iceberg/test/avro_schema_test.cc b/test/avro_schema_test.cc → src/iceberg/test/avro_schema_test.cc
diff --git a/test/avro_stream_test.cc → src/iceberg/test/avro_stream_test.cc b/test/avro_stream_test.cc → src/iceberg/test/avro_stream_test.cc
diff --git a/test/avro_test.cc → src/iceberg/test/avro_test.cc b/test/avro_test.cc → src/iceberg/test/avro_test.cc
diff --git a/test/config_test.cc → src/iceberg/test/config_test.cc b/test/config_test.cc → src/iceberg/test/config_test.cc
diff --git a/test/decimal_test.cc → src/iceberg/test/decimal_test.cc b/test/decimal_test.cc → src/iceberg/test/decimal_test.cc
diff --git a/test/endian_test.cc → src/iceberg/test/endian_test.cc b/test/endian_test.cc → src/iceberg/test/endian_test.cc
diff --git a/test/expression_test.cc → src/iceberg/test/expression_test.cc b/test/expression_test.cc → src/iceberg/test/expression_test.cc
diff --git a/test/file_scan_task_test.cc → src/iceberg/test/file_scan_task_test.cc b/test/file_scan_task_test.cc → src/iceberg/test/file_scan_task_test.cc
diff --git a/test/formatter_test.cc → src/iceberg/test/formatter_test.cc b/test/formatter_test.cc → src/iceberg/test/formatter_test.cc
diff --git a/test/gzip_decompress_test.cc → src/iceberg/test/gzip_decompress_test.cc b/test/gzip_decompress_test.cc → src/iceberg/test/gzip_decompress_test.cc
diff --git a/test/in_memory_catalog_test.cc → src/iceberg/test/in_memory_catalog_test.cc b/test/in_memory_catalog_test.cc → src/iceberg/test/in_memory_catalog_test.cc
diff --git a/test/json_internal_test.cc → src/iceberg/test/json_internal_test.cc b/test/json_internal_test.cc → src/iceberg/test/json_internal_test.cc
diff --git a/test/literal_test.cc → src/iceberg/test/literal_test.cc b/test/literal_test.cc → src/iceberg/test/literal_test.cc
diff --git a/test/manifest_list_reader_test.cc → ...iceberg/test/manifest_list_reader_test.cc b/test/manifest_list_reader_test.cc → ...iceberg/test/manifest_list_reader_test.cc
diff --git a/test/manifest_reader_test.cc → src/iceberg/test/manifest_reader_test.cc b/test/manifest_reader_test.cc → src/iceberg/test/manifest_reader_test.cc
diff --git a/test/matchers.h → src/iceberg/test/matchers.h b/test/matchers.h → src/iceberg/test/matchers.h
diff --git a/test/metadata_io_test.cc → src/iceberg/test/metadata_io_test.cc b/test/metadata_io_test.cc → src/iceberg/test/metadata_io_test.cc
diff --git a/test/metadata_serde_test.cc → src/iceberg/test/metadata_serde_test.cc b/test/metadata_serde_test.cc → src/iceberg/test/metadata_serde_test.cc
diff --git a/test/mock_catalog.h → src/iceberg/test/mock_catalog.h b/test/mock_catalog.h → src/iceberg/test/mock_catalog.h
diff --git a/test/name_mapping_test.cc → src/iceberg/test/name_mapping_test.cc b/test/name_mapping_test.cc → src/iceberg/test/name_mapping_test.cc
diff --git a/test/parquet_data_test.cc → src/iceberg/test/parquet_data_test.cc b/test/parquet_data_test.cc → src/iceberg/test/parquet_data_test.cc
diff --git a/test/parquet_schema_test.cc → src/iceberg/test/parquet_schema_test.cc b/test/parquet_schema_test.cc → src/iceberg/test/parquet_schema_test.cc
diff --git a/test/parquet_test.cc → src/iceberg/test/parquet_test.cc b/test/parquet_test.cc → src/iceberg/test/parquet_test.cc
diff --git a/test/partition_field_test.cc → src/iceberg/test/partition_field_test.cc b/test/partition_field_test.cc → src/iceberg/test/partition_field_test.cc
diff --git a/test/partition_spec_test.cc → src/iceberg/test/partition_spec_test.cc b/test/partition_spec_test.cc → src/iceberg/test/partition_spec_test.cc
diff --git a/...f1bc9-830b-4015-aced-c060df36f150-m0.avro → ...f1bc9-830b-4015-aced-c060df36f150-m0.avro b/...f1bc9-830b-4015-aced-c060df36f150-m0.avro → ...f1bc9-830b-4015-aced-c060df36f150-m0.avro
diff --git a/...57cd7-391f-4df8-aa24-e7e667da8870-m4.avro → ...57cd7-391f-4df8-aa24-e7e667da8870-m4.avro b/...57cd7-391f-4df8-aa24-e7e667da8870-m4.avro → ...57cd7-391f-4df8-aa24-e7e667da8870-m4.avro
diff --git a/...ableMetadataPartitionStatisticsFiles.json → ...ableMetadataPartitionStatisticsFiles.json b/...ableMetadataPartitionStatisticsFiles.json → ...ableMetadataPartitionStatisticsFiles.json
diff --git a/...sources/TableMetadataStatisticsFiles.json → ...sources/TableMetadataStatisticsFiles.json b/...sources/TableMetadataStatisticsFiles.json → ...sources/TableMetadataStatisticsFiles.json
diff --git a/...rces/TableMetadataUnsupportedVersion.json → ...rces/TableMetadataUnsupportedVersion.json b/...rces/TableMetadataUnsupportedVersion.json → ...rces/TableMetadataUnsupportedVersion.json
diff --git a/...ces/TableMetadataV1MissingSchemaType.json → ...ces/TableMetadataV1MissingSchemaType.json b/...ces/TableMetadataV1MissingSchemaType.json → ...ces/TableMetadataV1MissingSchemaType.json
diff --git a/test/resources/TableMetadataV1Valid.json → .../test/resources/TableMetadataV1Valid.json b/test/resources/TableMetadataV1Valid.json → .../test/resources/TableMetadataV1Valid.json
diff --git a/...TableMetadataV2CurrentSchemaNotFound.json → ...TableMetadataV2CurrentSchemaNotFound.json b/...TableMetadataV2CurrentSchemaNotFound.json → ...TableMetadataV2CurrentSchemaNotFound.json
diff --git a/...ableMetadataV2MissingLastPartitionId.json → ...ableMetadataV2MissingLastPartitionId.json b/...ableMetadataV2MissingLastPartitionId.json → ...ableMetadataV2MissingLastPartitionId.json
diff --git a/...TableMetadataV2MissingPartitionSpecs.json → ...TableMetadataV2MissingPartitionSpecs.json b/...TableMetadataV2MissingPartitionSpecs.json → ...TableMetadataV2MissingPartitionSpecs.json
diff --git a/...ources/TableMetadataV2MissingSchemas.json → ...ources/TableMetadataV2MissingSchemas.json b/...ources/TableMetadataV2MissingSchemas.json → ...ources/TableMetadataV2MissingSchemas.json
diff --git a/...rces/TableMetadataV2MissingSortOrder.json → ...rces/TableMetadataV2MissingSortOrder.json b/...rces/TableMetadataV2MissingSortOrder.json → ...rces/TableMetadataV2MissingSortOrder.json
diff --git a/test/resources/TableMetadataV2Valid.json → .../test/resources/TableMetadataV2Valid.json b/test/resources/TableMetadataV2Valid.json → .../test/resources/TableMetadataV2Valid.json
diff --git a/...esources/TableMetadataV2ValidMinimal.json → ...esources/TableMetadataV2ValidMinimal.json b/...esources/TableMetadataV2ValidMinimal.json → ...esources/TableMetadataV2ValidMinimal.json
diff --git a/...esources/TableMetadataV3ValidMinimal.json → ...esources/TableMetadataV3ValidMinimal.json b/...esources/TableMetadataV3ValidMinimal.json → ...esources/TableMetadataV3ValidMinimal.json
diff --git a/...ccb6dbcb-0611-48da-be68-bd506ea63188.avro → ...ccb6dbcb-0611-48da-be68-bd506ea63188.avro b/...ccb6dbcb-0611-48da-be68-bd506ea63188.avro → ...ccb6dbcb-0611-48da-be68-bd506ea63188.avro
diff --git a/...aeffe099-3bac-4011-bc17-5875210d8dc0.avro → ...aeffe099-3bac-4011-bc17-5875210d8dc0.avro b/...aeffe099-3bac-4011-bc17-5875210d8dc0.avro → ...aeffe099-3bac-4011-bc17-5875210d8dc0.avro
diff --git a/...2bccd69e-d642-4816-bba0-261cd9bd0d93.avro → ...2bccd69e-d642-4816-bba0-261cd9bd0d93.avro b/...2bccd69e-d642-4816-bba0-261cd9bd0d93.avro → ...2bccd69e-d642-4816-bba0-261cd9bd0d93.avro
diff --git a/...5d690750-8fb4-4cd1-8ae7-85c7b39abe14.avro → ...5d690750-8fb4-4cd1-8ae7-85c7b39abe14.avro b/...5d690750-8fb4-4cd1-8ae7-85c7b39abe14.avro → ...5d690750-8fb4-4cd1-8ae7-85c7b39abe14.avro
diff --git a/...eafd2972-f58e-4185-9237-6378f564787e.avro → ...eafd2972-f58e-4185-9237-6378f564787e.avro b/...eafd2972-f58e-4185-9237-6378f564787e.avro → ...eafd2972-f58e-4185-9237-6378f564787e.avro
diff --git a/test/roaring_test.cc → src/iceberg/test/roaring_test.cc b/test/roaring_test.cc → src/iceberg/test/roaring_test.cc
diff --git a/test/schema_field_test.cc → src/iceberg/test/schema_field_test.cc b/test/schema_field_test.cc → src/iceberg/test/schema_field_test.cc
diff --git a/test/schema_json_test.cc → src/iceberg/test/schema_json_test.cc b/test/schema_json_test.cc → src/iceberg/test/schema_json_test.cc
diff --git a/test/schema_test.cc → src/iceberg/test/schema_test.cc b/test/schema_test.cc → src/iceberg/test/schema_test.cc
diff --git a/test/schema_util_test.cc → src/iceberg/test/schema_util_test.cc b/test/schema_util_test.cc → src/iceberg/test/schema_util_test.cc
diff --git a/test/snapshot_test.cc → src/iceberg/test/snapshot_test.cc b/test/snapshot_test.cc → src/iceberg/test/snapshot_test.cc
diff --git a/test/sort_field_test.cc → src/iceberg/test/sort_field_test.cc b/test/sort_field_test.cc → src/iceberg/test/sort_field_test.cc
diff --git a/test/sort_order_test.cc → src/iceberg/test/sort_order_test.cc b/test/sort_order_test.cc → src/iceberg/test/sort_order_test.cc
diff --git a/test/string_util_test.cc → src/iceberg/test/string_util_test.cc b/test/string_util_test.cc → src/iceberg/test/string_util_test.cc
diff --git a/test/table_test.cc → src/iceberg/test/table_test.cc b/test/table_test.cc → src/iceberg/test/table_test.cc
diff --git a/test/temp_file_test_base.h → src/iceberg/test/temp_file_test_base.h b/test/temp_file_test_base.h → src/iceberg/test/temp_file_test_base.h
diff --git a/test/test_common.cc → src/iceberg/test/test_common.cc b/test/test_common.cc → src/iceberg/test/test_common.cc
diff --git a/test/test_common.h → src/iceberg/test/test_common.h b/test/test_common.h → src/iceberg/test/test_common.h
diff --git a/test/test_config.h.in → src/iceberg/test/test_config.h.in b/test/test_config.h.in → src/iceberg/test/test_config.h.in
diff --git a/test/transform_test.cc → src/iceberg/test/transform_test.cc b/test/transform_test.cc → src/iceberg/test/transform_test.cc
diff --git a/test/type_test.cc → src/iceberg/test/type_test.cc b/test/type_test.cc → src/iceberg/test/type_test.cc
diff --git a/test/uuid_test.cc → src/iceberg/test/uuid_test.cc b/test/uuid_test.cc → src/iceberg/test/uuid_test.cc
diff --git a/test/visit_type_test.cc → src/iceberg/test/visit_type_test.cc b/test/visit_type_test.cc → src/iceberg/test/visit_type_test.cc