Merge pull request #535 from apache/serialization-test-data-dir

Move Java test fixtures to serialization_test_data/java_generated_files

Author: leerho

.github/workflows/serde_compat.yml

@@ -17,16 +17,18 @@ jobs:
         uses: actions/checkout@v5
         with:
           repository: apache/datasketches-java
-          path: java
+          path: datasketches-java
       - name: Setup Java
         uses: actions/setup-java@v5
         with:
           java-version: '25'
           distribution: 'temurin'
       - name: Run Java
-        run: cd java && mvn test -P generate-java-files
+        run: cd datasketches-java && mvn test -P generate-java-files
       - name: Copy files
-        run: cp java/serialization_test_data/java_generated_files/*.sk java
+        run: |
+          mkdir -p serialization_test_data/java_generated_files
+          cp datasketches-java/serialization_test_data/java_generated_files/*.sk serialization_test_data/java_generated_files
       - name: Run cmake
         run: cd build && cmake .. -DSERDE_COMPAT=true
       - name: Build C++ unit tests

.gitignore

@@ -42,4 +42,7 @@ _*/
 !__init__.py
 
 docs
-java
+# Cross-language test data: sketch snapshots and the datasketches-java checkout used to generate them
+serialization_test_data/
+datasketches-java/
+*.sk

cpc/test/cpc_sketch_deserialize_from_java_test.cpp

@@ -24,8 +24,8 @@
 namespace datasketches {
 
 // assume the binary sketches for this test have been generated by datasketches-java code
-// in the subdirectory called "java" in the root directory of this project
-static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../java/";
+// in the subdirectory "serialization_test_data/java_generated_files" in the root directory of this project
+static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../serialization_test_data/java_generated_files/";
 
 TEST_CASE("cpc sketch", "[serde_compat]") {
   const unsigned n_arr[] = {0, 100, 200, 2000, 20000};

fi/test/frequent_items_sketch_deserialize_from_java_test.cpp

@@ -24,8 +24,8 @@
 namespace datasketches {
 
 // assume the binary sketches for this test have been generated by datasketches-java code
-// in the subdirectory called "java" in the root directory of this project
-static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../java/";
+// in the subdirectory "serialization_test_data/java_generated_files" in the root directory of this project
+static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../serialization_test_data/java_generated_files/";
 
 TEST_CASE("frequent longs", "[serde_compat]") {
   const unsigned n_arr[] = {0, 1, 10, 100, 1000, 10000, 100000, 1000000};

filters/test/bloom_filter_deserialize_from_java_test.cpp

@@ -25,8 +25,8 @@
 namespace datasketches {
 
 // assume the binary sketches for this test have been generated by datasketches-java code
-// in the subdirectory called "java" in the root directory of this project
-static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../java/";
+// in the subdirectory "serialization_test_data/java_generated_files" in the root directory of this project
+static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../serialization_test_data/java_generated_files/";
 
 TEST_CASE("bloom_filter", "[serde_compat]") {
   const uint64_t n_arr[] = {0, 10000, 2000000, 30000000};

hll/test/hll_sketch_deserialize_from_java_test.cpp

@@ -24,8 +24,8 @@
 namespace datasketches {
 
 // assume the binary sketches for this test have been generated by datasketches-java code
-// in the subdirectory called "java" in the root directory of this project
-static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../java/";
+// in the subdirectory "serialization_test_data/java_generated_files" in the root directory of this project
+static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../serialization_test_data/java_generated_files/";
 
 TEST_CASE("hll4 sketch", "[serde_compat]") {
   const unsigned n_arr[] = {0, 10, 100, 1000, 10000, 100000, 1000000};

kll/test/kll_sketch_deserialize_from_java_test.cpp

@@ -24,8 +24,8 @@
 namespace datasketches {
 
 // assume the binary sketches for this test have been generated by datasketches-java code
-// in the subdirectory called "java" in the root directory of this project
-static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../java/";
+// in the subdirectory "serialization_test_data/java_generated_files" in the root directory of this project
+static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../serialization_test_data/java_generated_files/";
 
 TEST_CASE("kll float", "[serde_compat]") {
   const unsigned n_arr[] = {0, 1, 10, 100, 1000, 10000, 100000, 1000000};

quantiles/test/quantiles_sketch_deserialize_from_java_test.cpp

@@ -24,8 +24,8 @@
 namespace datasketches {
 
 // assume the binary sketches for this test have been generated by datasketches-java code
-// in the subdirectory called "java" in the root directory of this project
-static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../java/";
+// in the subdirectory "serialization_test_data/java_generated_files" in the root directory of this project
+static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../serialization_test_data/java_generated_files/";
 
 TEST_CASE("quantiles double", "[serde_compat]") {
   const unsigned n_arr[] = {0, 1, 10, 100, 1000, 10000, 100000, 1000000};

req/test/req_sketch_deserialize_from_java_test.cpp

@@ -24,8 +24,8 @@
 namespace datasketches {
 
 // assume the binary sketches for this test have been generated by datasketches-java code
-// in the subdirectory called "java" in the root directory of this project
-static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../java/";
+// in the subdirectory "serialization_test_data/java_generated_files" in the root directory of this project
+static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../serialization_test_data/java_generated_files/";
 
 TEST_CASE("req float", "[serde_compat]") {
   const unsigned n_arr[] = {0, 1, 10, 100, 1000, 10000, 100000, 1000000};

sampling/test/var_opt_sketch_deserialize_from_java_test.cpp

@@ -24,8 +24,8 @@
 namespace datasketches {
 
 // assume the binary sketches for this test have been generated by datasketches-java code
-// in the subdirectory called "java" in the root directory of this project
-static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../java/";
+// in the subdirectory "serialization_test_data/java_generated_files" in the root directory of this project
+static std::string testBinaryInputPath = std::string(TEST_BINARY_INPUT_PATH) + "../../serialization_test_data/java_generated_files/";
 
 TEST_CASE("var opt sketch long", "[serde_compat]") {
   const unsigned n_arr[] = {0, 1, 10, 100, 1000, 10000, 100000, 1000000};