update

HeartLinked · HeartLinked · commit e2af00660b2c · 2025-11-28T17:38:28.000+08:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -77,8 +77,8 @@ jobs:
         shell: bash
         run: ci/scripts/build_example.sh $(pwd)/example
   windows:
-    name: AMD64 Windows 2022
-    runs-on: windows-2022
+    name: AMD64 Windows 2025
+    runs-on: windows-2025
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -92,12 +92,12 @@ jobs:
       - name: Build Iceberg
         shell: cmd
         run: |
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+          call "C:\Program Files\Microsoft Visual Studio\2025\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
           bash -c "ci/scripts/build_iceberg.sh $(pwd)"
       - name: Build Example
         shell: cmd
         run: |
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+          call "C:\Program Files\Microsoft Visual Studio\2025\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
           bash -c "ci/scripts/build_example.sh $(pwd)/example"
   meson:
     name: Meson - ${{ matrix.title }}
diff --git a/src/iceberg/test/CMakeLists.txt b/src/iceberg/test/CMakeLists.txt
@@ -78,8 +78,7 @@ add_iceberg_test(table_test
                  table_test.cc
                  table_metadata_builder_test.cc
                  table_requirement_test.cc
-                 table_update_test.cc
-                 test_common.cc)
+                 table_update_test.cc)
 
 add_iceberg_test(expression_test
                  SOURCES
@@ -91,7 +90,6 @@ add_iceberg_test(expression_test
 
 add_iceberg_test(json_serde_test
                  SOURCES
-                 test_common.cc
                  json_internal_test.cc
                  metadata_serde_test.cc
                  schema_json_test.cc)
@@ -121,8 +119,7 @@ if(ICEBERG_BUILD_BUNDLE)
                    manifest_list_reader_writer_test.cc
                    manifest_list_versions_test.cc
                    manifest_reader_writer_test.cc
-                   manifest_writer_versions_test.cc
-                   test_common.cc)
+                   manifest_writer_versions_test.cc)
 
   add_iceberg_test(arrow_test
                    USE_BUNDLE
@@ -133,18 +130,13 @@ if(ICEBERG_BUILD_BUNDLE)
                    metadata_io_test.cc
                    struct_like_test.cc)
 
-  add_iceberg_test(catalog_test
-                   USE_BUNDLE
-                   SOURCES
-                   test_common.cc
-                   in_memory_catalog_test.cc)
+  add_iceberg_test(catalog_test USE_BUNDLE SOURCES in_memory_catalog_test.cc)
 
   add_iceberg_test(eval_expr_test
                    USE_BUNDLE
                    SOURCES
                    eval_expr_test.cc
-                   evaluator_test.cc
-                   test_common.cc)
+                   evaluator_test.cc)
 
   add_iceberg_test(parquet_test
                    USE_BUNDLE
diff --git a/src/iceberg/test/in_memory_catalog_test.cc b/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/test_common.h"
+#include "iceberg/test/util/test_common.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/manifest_list_reader_writer_test.cc b/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/test_common.h"
+#include "iceberg/test/util/test_common.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/manifest_reader_writer_test.cc b/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/test_common.h"
+#include "iceberg/test/util/test_common.h"
 #include "iceberg/transform.h"
 #include "iceberg/type.h"
 
diff --git a/src/iceberg/test/meson.build b/src/iceberg/test/meson.build
@@ -53,7 +53,6 @@ iceberg_tests = {
             'table_requirement_test.cc',
             'table_test.cc',
             'table_update_test.cc',
-            'test_common.cc',
         ),
     },
     'expression_test': {
@@ -70,7 +69,6 @@ iceberg_tests = {
             'json_internal_test.cc',
             'metadata_serde_test.cc',
             'schema_json_test.cc',
-            'test_common.cc',
         ),
     },
     'util_test': {
diff --git a/src/iceberg/test/metadata_serde_test.cc b/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/test_common.h"
+#include "iceberg/test/util/test_common.h"
 #include "iceberg/transform.h"
 #include "iceberg/type.h"
 
diff --git a/src/iceberg/test/table_test.cc b/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/test_common.h"
+#include "iceberg/test/util/test_common.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/util/CMakeLists.txt b/src/iceberg/test/util/CMakeLists.txt
@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set(ICEBERG_TEST_UTIL_SOURCES tmp_util.cc)
-set(ICEBERG_TEST_UTIL_HEADERS tmp_util.h)
+set(ICEBERG_TEST_UTIL_SOURCES test_common.cc)
+set(ICEBERG_TEST_UTIL_HEADERS test_common.h)
 
 # Platform-specific integration test utilities (Linux-specific)
 if(ICEBERG_BUILD_REST_INTEGRATION_TESTS)
@@ -29,7 +29,8 @@ add_library(iceberg_test_util STATIC ${ICEBERG_TEST_UTIL_SOURCES})
 target_include_directories(iceberg_test_util PUBLIC ${CMAKE_SOURCE_DIR}/src
                                                     ${CMAKE_BINARY_DIR}/src)
 
-target_link_libraries(iceberg_test_util PUBLIC iceberg_static)
+target_link_libraries(iceberg_test_util PUBLIC iceberg_static GTest::gtest
+                                               nlohmann_json::nlohmann_json)
 
 install(FILES ${ICEBERG_TEST_UTIL_HEADERS}
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iceberg/test/util)
diff --git a/src/iceberg/test/util/cmd_util.cc b/src/iceberg/test/util/cmd_util.cc
@@ -30,7 +30,7 @@
 
 #include "iceberg/result.h"
 
-namespace iceberg::test {
+namespace iceberg {
 
 Command::Command(std::string program) : program_(std::move(program)) {}
 
@@ -216,4 +216,4 @@ std::string Command::fmt_args() const {
   return s;
 }
 
-}  // namespace iceberg::test
+}  // namespace iceberg
diff --git a/src/iceberg/test/util/cmd_util.h b/src/iceberg/test/util/cmd_util.h
@@ -27,7 +27,7 @@
 /// \file iceberg/test/util/cmd_util.h
 /// Utilities for building and executing shell commands in tests.
 
-namespace iceberg::test {
+namespace iceberg {
 
 /// \brief A shell command builder and executor for tests.
 class Command {
@@ -63,4 +63,4 @@ class Command {
   std::string fmt_args() const;
 };
 
-}  // namespace iceberg::test
+}  // namespace iceberg
diff --git a/src/iceberg/test/util/docker_compose_util.cc b/src/iceberg/test/util/docker_compose_util.cc
@@ -23,7 +23,7 @@
 
 #include "iceberg/test/util/cmd_util.h"
 
-namespace iceberg::test {
+namespace iceberg {
 
 DockerCompose::DockerCompose(std::string project_name,
                              std::filesystem::path docker_compose_dir)
@@ -51,4 +51,4 @@ Command DockerCompose::BuildDockerCommand(const std::vector<std::string>& args)
   return cmd;
 }
 
-}  // namespace iceberg::test
+}  // namespace iceberg
diff --git a/src/iceberg/test/util/docker_compose_util.h b/src/iceberg/test/util/docker_compose_util.h
@@ -25,17 +25,15 @@
 
 #include "iceberg/test/util/cmd_util.h"
 
-namespace iceberg::test {
+namespace iceberg {
 
 /// \brief Docker Compose orchestration utilities for integration testing
-///
-/// This class provides RAII-style management of Docker Compose services.
-/// Services are automatically stopped and cleaned up when the instance is destroyed.
 class DockerCompose {
  public:
-  /// \brief Construct a DockerCompose manager
-  /// \param project_name Unique name for this docker-compose project
-  /// \param docker_compose_dir Directory containing docker-compose.yml
+  /// \brief Initializes the Docker Compose manager context.
+  /// \param project_name A unique identifier for this project to ensure test isolation.
+  /// \param docker_compose_dir The directory path containing the target
+  /// docker-compose.yml.
   DockerCompose(std::string project_name, std::filesystem::path docker_compose_dir);
 
   ~DockerCompose();
@@ -45,23 +43,25 @@ class DockerCompose {
   DockerCompose(DockerCompose&&) = default;
   DockerCompose& operator=(DockerCompose&&) = default;
 
-  /// \brief Get the docker project name
+  /// \brief Get the docker project name.
   const std::string& project_name() const { return project_name_; }
 
-  /// \brief Start all services defined in docker-compose.yml
+  /// \brief Executes 'docker-compose up' to start services.
+  /// \note May throw an exception if the services fail to start.
   void Up();
 
-  /// \brief Stop and remove all services
+  /// \brief Executes 'docker-compose down' to stop and remove services.
+  /// \note May throw an exception if the services fail to stop.
   void Down();
 
  private:
   std::string project_name_;
   std::filesystem::path docker_compose_dir_;
 
-  /// \brief Build a docker compose Command with proper environment
-  /// \param args Additional command line arguments
-  /// \return Command object ready to execute
+  /// \brief Build a docker compose Command with proper environment.
+  /// \param args Additional command line arguments.
+  /// \return Command object ready to execute.
   Command BuildDockerCommand(const std::vector<std::string>& args) const;
 };
 
-}  // namespace iceberg::test
+}  // namespace iceberg
diff --git a/src/iceberg/test/util/meson.build b/src/iceberg/test/util/meson.build
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-iceberg_test_util_sources = files('tmp_util.cc')
+iceberg_test_util_sources = files('test_common.cc')
 
 # Platform-specific integration test utilities (Linux-specific)
 if get_option('rest_integration_test').enabled()
@@ -38,4 +38,4 @@ iceberg_test_util_dep = declare_dependency(
     include_directories: include_directories('.'),
 )
 
-install_headers(['tmp_util.h'], subdir: 'iceberg/test/util')
+install_headers(['test_common.h'], subdir: 'iceberg/test/util')
diff --git a/src/iceberg/test/util/test_common.cc b/src/iceberg/test/util/test_common.cc
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "iceberg/test/test_common.h"
+#include "iceberg/test/util/test_common.h"
 
 #include <filesystem>
 #include <fstream>
diff --git a/src/iceberg/test/util/test_common.h b/src/iceberg/test/util/test_common.h
diff --git a/src/iceberg/test/util/tmp_util.cc b/src/iceberg/test/util/tmp_util.cc
diff --git a/src/iceberg/test/util/tmp_util.h b/src/iceberg/test/util/tmp_util.h

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`
`31`	`31`	`#include "iceberg/result.h"`
`32`	`32`
`33`		`-namespace iceberg::test {`
	`33`	`+namespace iceberg {`
`34`	`34`
`35`	`35`	`Command::Command(std::string program) : program_(std::move(program)) {}`
`36`	`36`
`@@ -216,4 +216,4 @@ std::string Command::fmt_args() const {`
`216`	`216`	`return s;`
`217`	`217`	`}`
`218`	`218`
`219`		`-} // namespace iceberg::test`
	`219`	`+} // namespace iceberg`