This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch Revert_to_classLoader_getResource in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
commit 63efe71bf09365ae81b86ac8e25f250e7967d58e Author: Lee Rhodes <[email protected]> AuthorDate: Mon Oct 16 16:55:53 2023 -0700 Complete revert of using ClassLoader.getResource() for getting files in the resources directory. These were the tests that referred to the "cppHistPath = "src/java/test/" path. This does not exist in jars of the class files. --- src/test/java/org/apache/datasketches/common/TestUtil.java | 5 ----- .../java/org/apache/datasketches/kll/KllCrossLanguageTest.java | 6 +++--- .../datasketches/quantiles/QuantilesSketchCrossLanguageTest.java | 8 ++------ .../org/apache/datasketches/tuple/TupleCrossLanguageTest.java | 6 +++++- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/test/java/org/apache/datasketches/common/TestUtil.java b/src/test/java/org/apache/datasketches/common/TestUtil.java index 5a5fdacb..f02048d2 100644 --- a/src/test/java/org/apache/datasketches/common/TestUtil.java +++ b/src/test/java/org/apache/datasketches/common/TestUtil.java @@ -48,11 +48,6 @@ public final class TestUtil { */ public static final Path cppPath = createPath("target/cpp_generated_files"); - /** - * The full target Path for historical C++ serialized sketches to be tested by Java. - */ - public static final Path cppHistPath = createPath("src/test/resources"); - private static Path createPath(final String projectLocalDir) { try { return Files.createDirectories(Paths.get(userDir, projectLocalDir)); diff --git a/src/test/java/org/apache/datasketches/kll/KllCrossLanguageTest.java b/src/test/java/org/apache/datasketches/kll/KllCrossLanguageTest.java index ff50bd3f..ceb3bc6d 100644 --- a/src/test/java/org/apache/datasketches/kll/KllCrossLanguageTest.java +++ b/src/test/java/org/apache/datasketches/kll/KllCrossLanguageTest.java @@ -22,9 +22,9 @@ package org.apache.datasketches.kll; import static org.apache.datasketches.common.TestUtil.CHECK_CPP_FILES; import static org.apache.datasketches.common.TestUtil.CHECK_CPP_HISTORICAL_FILES; import static org.apache.datasketches.common.TestUtil.GENERATE_JAVA_FILES; -import static org.apache.datasketches.common.TestUtil.cppHistPath; import static org.apache.datasketches.common.TestUtil.cppPath; import static org.apache.datasketches.common.TestUtil.javaPath; +import static org.apache.datasketches.common.Util.getResourceBytes; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -80,7 +80,7 @@ public class KllCrossLanguageTest { @Test(groups = {CHECK_CPP_HISTORICAL_FILES}) public void checkCppKllDoublesSketchOneItemVersion1() throws IOException { - final byte[] byteArr = Files.readAllBytes(cppHistPath.resolve("kll_sketch_double_one_item_v1.sk")); + final byte[] byteArr = getResourceBytes("kll_sketch_double_one_item_v1.sk"); final KllDoublesSketch sk = KllDoublesSketch.heapify(Memory.wrap(byteArr)); assertFalse(sk.isEmpty()); assertFalse(sk.isEstimationMode()); @@ -92,7 +92,7 @@ public class KllCrossLanguageTest { @Test(groups = {CHECK_CPP_HISTORICAL_FILES}) public void checkCppKllFloatsSketchOneItemVersion1() throws IOException { - final byte[] byteArr = Files.readAllBytes(cppHistPath.resolve("kll_sketch_float_one_item_v1.sk")); + final byte[] byteArr = getResourceBytes("kll_sketch_float_one_item_v1.sk"); final KllFloatsSketch sk = KllFloatsSketch.heapify(Memory.wrap(byteArr)); assertFalse(sk.isEmpty()); assertFalse(sk.isEstimationMode()); diff --git a/src/test/java/org/apache/datasketches/quantiles/QuantilesSketchCrossLanguageTest.java b/src/test/java/org/apache/datasketches/quantiles/QuantilesSketchCrossLanguageTest.java index c2c1238f..bc127e95 100644 --- a/src/test/java/org/apache/datasketches/quantiles/QuantilesSketchCrossLanguageTest.java +++ b/src/test/java/org/apache/datasketches/quantiles/QuantilesSketchCrossLanguageTest.java @@ -22,9 +22,9 @@ package org.apache.datasketches.quantiles; import static org.apache.datasketches.common.TestUtil.CHECK_CPP_FILES; import static org.apache.datasketches.common.TestUtil.CHECK_CPP_HISTORICAL_FILES; import static org.apache.datasketches.common.TestUtil.GENERATE_JAVA_FILES; -import static org.apache.datasketches.common.TestUtil.cppHistPath; import static org.apache.datasketches.common.TestUtil.cppPath; import static org.apache.datasketches.common.TestUtil.javaPath; +import static org.apache.datasketches.common.Util.getResourceBytes; import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -34,7 +34,6 @@ import java.nio.file.Files; import java.util.Comparator; import org.apache.datasketches.common.ArrayOfStringsSerDe; -import org.apache.datasketches.common.SketchesArgumentException; import org.apache.datasketches.memory.Memory; import org.apache.datasketches.quantilescommon.QuantilesDoublesSketchIterator; import org.apache.datasketches.quantilescommon.QuantilesGenericSketchIterator; @@ -239,10 +238,7 @@ public class QuantilesSketchCrossLanguageTest { println("fullName: "+ fileName); println("Old Median: " + quantile); //Read File bytes - byte[] byteArr; - try { - byteArr = Files.readAllBytes(cppHistPath.resolve(fileName)); - } catch (IOException e) { throw new SketchesArgumentException(e.getCause().toString()); } + byte[] byteArr = getResourceBytes(fileName); Memory srcMem = Memory.wrap(byteArr); // heapify as update sketch diff --git a/src/test/java/org/apache/datasketches/tuple/TupleCrossLanguageTest.java b/src/test/java/org/apache/datasketches/tuple/TupleCrossLanguageTest.java index ae3522b5..ad6485d2 100644 --- a/src/test/java/org/apache/datasketches/tuple/TupleCrossLanguageTest.java +++ b/src/test/java/org/apache/datasketches/tuple/TupleCrossLanguageTest.java @@ -19,7 +19,11 @@ package org.apache.datasketches.tuple; -import static org.apache.datasketches.common.TestUtil.*; +import static org.apache.datasketches.common.TestUtil.CHECK_CPP_FILES; +import static org.apache.datasketches.common.TestUtil.CHECK_CPP_HISTORICAL_FILES; +import static org.apache.datasketches.common.TestUtil.GENERATE_JAVA_FILES; +import static org.apache.datasketches.common.TestUtil.cppPath; +import static org.apache.datasketches.common.TestUtil.javaPath; import static org.apache.datasketches.common.Util.getResourceBytes; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
