1

Author: HeartLinked

src/iceberg/test/in_memory_catalog_test.cc

@@ -31,7 +31,7 @@
 #include "iceberg/table_metadata.h"
 #include "iceberg/test/matchers.h"
 #include "iceberg/test/mock_catalog.h"
-#include "iceberg/test/util/test_common.h"
+#include "iceberg/test/util/common_util.h"
 
 namespace iceberg {
 

src/iceberg/test/manifest_list_reader_writer_test.cc

@@ -28,7 +28,7 @@
 #include "iceberg/manifest_writer.h"
 #include "iceberg/test/matchers.h"
 #include "iceberg/test/temp_file_test_base.h"
-#include "iceberg/test/util/test_common.h"
+#include "iceberg/test/util/common_util.h"
 
 namespace iceberg {
 

src/iceberg/test/manifest_reader_writer_test.cc

@@ -32,7 +32,7 @@
 #include "iceberg/schema.h"
 #include "iceberg/test/matchers.h"
 #include "iceberg/test/temp_file_test_base.h"
-#include "iceberg/test/util/test_common.h"
+#include "iceberg/test/util/common_util.h"
 #include "iceberg/transform.h"
 #include "iceberg/type.h"
 

src/iceberg/test/metadata_serde_test.cc

@@ -32,7 +32,7 @@
 #include "iceberg/statistics_file.h"
 #include "iceberg/table_metadata.h"
 #include "iceberg/test/matchers.h"
-#include "iceberg/test/util/test_common.h"
+#include "iceberg/test/util/common_util.h"
 #include "iceberg/transform.h"
 #include "iceberg/type.h"
 

src/iceberg/test/rest_catalog_test.cc

@@ -90,7 +90,7 @@ class RestCatalogIntegrationTest : public ::testing::Test {
         std::filesystem::path(__FILE__).parent_path() / "resources";
 
     // Create and start DockerCompose
-    docker_compose_ = std::make_unique<test::DockerCompose>(project_name, resources_dir);
+    docker_compose_ = std::make_unique<DockerCompose>(project_name, resources_dir);
     docker_compose_->Up();
 
     // Wait for REST catalog to be ready on localhost
@@ -127,7 +127,7 @@ class RestCatalogIntegrationTest : public ::testing::Test {
     return RestCatalog::Make(*config_);
   }
 
-  static inline std::unique_ptr<test::DockerCompose> docker_compose_;
+  static inline std::unique_ptr<DockerCompose> docker_compose_;
   std::unique_ptr<RestCatalogProperties> config_;
 };
 

src/iceberg/test/table_test.cc

@@ -32,7 +32,7 @@
 #include "iceberg/schema.h"
 #include "iceberg/snapshot.h"
 #include "iceberg/table_metadata.h"
-#include "iceberg/test/util/test_common.h"
+#include "iceberg/test/util/common_util.h"
 
 namespace iceberg {
 

src/iceberg/test/util/CMakeLists.txt

@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set(ICEBERG_TEST_UTIL_SOURCES test_common.cc)
-set(ICEBERG_TEST_UTIL_HEADERS test_common.h)
+set(ICEBERG_TEST_UTIL_SOURCES common_util.cc)
+set(ICEBERG_TEST_UTIL_HEADERS common_util.h)
 
 # Platform-specific integration test utilities (Linux-specific)
 if(ICEBERG_BUILD_REST_INTEGRATION_TESTS)

src/iceberg/test/util/test_common.cc src/iceberg/test/util/common_util.ccsrc/iceberg/test/util/test_common.cc renamed to src/iceberg/test/util/common_util.cc

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "iceberg/test/util/test_common.h"
+#include "iceberg/test/util/common_util.h"
 
 #include <filesystem>
 #include <fstream>

src/iceberg/test/util/test_common.h src/iceberg/test/util/common_util.hsrc/iceberg/test/util/test_common.h renamed to src/iceberg/test/util/common_util.h

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-iceberg_test_util_sources = files('test_common.cc')
+iceberg_test_util_sources = files('common_util.cc')
 
 # Platform-specific integration test utilities (Linux-specific)
 if get_option('rest_integration_test').enabled()
@@ -26,10 +26,13 @@ if get_option('rest_integration_test').enabled()
     )
 endif
 
+gtest_dep = dependency('gtest')
+nlohmann_json_dep = dependency('nlohmann_json')
+
 iceberg_test_util_lib = static_library(
     'iceberg_test_util',
     sources: iceberg_test_util_sources,
-    dependencies: [iceberg_dep],
+    dependencies: [iceberg_dep, gtest_dep, nlohmann_json_dep],
     include_directories: include_directories('../..'),
 )
 
@@ -38,4 +41,4 @@ iceberg_test_util_dep = declare_dependency(
     include_directories: include_directories('.'),
 )
 
-install_headers(['test_common.h'], subdir: 'iceberg/test/util')
+install_headers(['common_util.h'], subdir: 'iceberg/test/util')