You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2020/05/13 23:20:34 UTC
[incubator-datasketches-java] 01/01: Change *.bin binary data test
files to *.sk
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch Change_bin_files_to_sk
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git
commit 90f7141ea894521f6b71d76adae561335a6b2f78
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Wed May 13 16:10:25 2020 -0700
Change *.bin binary data test files to *.sk
---
src/test/java/org/apache/datasketches/UtilTest.java | 8 ++++----
.../apache/datasketches/cpc/CpcCBinariesTest.java | 20 ++++++++++----------
.../org/apache/datasketches/cpc/CpcSketchTest.java | 2 +-
.../datasketches/cpc/SpecialCBinariesTest.java | 4 ++--
.../datasketches/kll/KllFloatsSketchTest.java | 2 +-
.../quantiles/ForwardCompatibilityTest.java | 18 +++++++++---------
.../datasketches/sampling/ReservoirSizeTest.java | 4 ++--
.../datasketches/tuple/ArrayOfDoublesUnionTest.java | 4 ++--
.../tuple/CompactSketchWithDoubleSummaryTest.java | 6 +++---
.../UpdatableSketchWithDoubleSummaryTest.java | 4 ++--
...ion_v0.9.1.bin => ArrayOfDoublesUnion_v0.9.1.sk} | Bin
...pactSketchWithDoubleSummary4K_serialVersion1.sk} | Bin
...Qk128_n1000_v0.3.0.bin => Qk128_n1000_v0.3.0.sk} | Bin
...Qk128_n1000_v0.6.0.bin => Qk128_n1000_v0.6.0.sk} | Bin
...Qk128_n1000_v0.8.0.bin => Qk128_n1000_v0.8.0.sk} | Bin
...Qk128_n1000_v0.8.3.bin => Qk128_n1000_v0.8.3.sk} | Bin
.../{Qk128_n50_v0.3.0.bin => Qk128_n50_v0.3.0.sk} | Bin
.../{Qk128_n50_v0.6.0.bin => Qk128_n50_v0.6.0.sk} | Bin
.../{Qk128_n50_v0.8.0.bin => Qk128_n50_v0.8.0.sk} | Bin
.../{Qk128_n50_v0.8.3.bin => Qk128_n50_v0.8.3.sk} | Bin
src/test/resources/{cpc-10m.bin => cpc-10m.sk} | Bin
src/test/resources/{cpc-empty.bin => cpc-empty.sk} | Bin
.../resources/{cpc-hybrid.bin => cpc-hybrid.sk} | Bin
.../resources/{cpc-pinned.bin => cpc-pinned.sk} | Bin
.../resources/{cpc-sliding.bin => cpc-sliding.sk} | Bin
.../resources/{cpc-sparse.bin => cpc-sparse.sk} | Bin
..._item_v1.bin => kll_sketch_float_one_item_v1.sk} | Bin
27 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/test/java/org/apache/datasketches/UtilTest.java b/src/test/java/org/apache/datasketches/UtilTest.java
index c4fea7c..52b92dc 100644
--- a/src/test/java/org/apache/datasketches/UtilTest.java
+++ b/src/test/java/org/apache/datasketches/UtilTest.java
@@ -331,27 +331,27 @@ public class UtilTest {
@Test
public void resourcefileExists() {
- final String shortFileName = "cpc-empty.bin";
+ final String shortFileName = "cpc-empty.sk";
final File file = getResourceFile(shortFileName);
assertTrue(file.exists());
}
@Test(expectedExceptions = SketchesArgumentException.class)
public void resourceFileNotFound() {
- final String shortFileName = "cpc-empty.bin";
+ final String shortFileName = "cpc-empty.sk";
getResourceFile(shortFileName + "123");
}
@Test
public void resourceBytesCorrect() {
- final String shortFileName = "cpc-empty.bin";
+ final String shortFileName = "cpc-empty.sk";
final byte[] bytes = getResourceBytes(shortFileName);
assertTrue(bytes.length == 8);
}
@Test(expectedExceptions = SketchesArgumentException.class)
public void resourceBytesFileNotFound() {
- final String shortFileName = "cpc-empty.bin";
+ final String shortFileName = "cpc-empty.sk";
getResourceBytes(shortFileName + "123");
}
diff --git a/src/test/java/org/apache/datasketches/cpc/CpcCBinariesTest.java b/src/test/java/org/apache/datasketches/cpc/CpcCBinariesTest.java
index 5c548f9..3df8816 100644
--- a/src/test/java/org/apache/datasketches/cpc/CpcCBinariesTest.java
+++ b/src/test/java/org/apache/datasketches/cpc/CpcCBinariesTest.java
@@ -41,7 +41,7 @@ public class CpcCBinariesTest {
@Test
public void checkEmptyBin() {
- final String fileName = "cpc-empty.bin";
+ final String fileName = "cpc-empty.sk";
final File file = getResourceFile(fileName);
try (MapHandle mh = Memory.map(file)) {
final Memory wmem = mh.get();
@@ -55,7 +55,7 @@ public class CpcCBinariesTest {
@Test
public void checkSparseBin() {
- final String fileName = "cpc-sparse.bin";
+ final String fileName = "cpc-sparse.sk";
final File file = getResourceFile(fileName);
try (MapHandle mh = Memory.map(file)) {
final Memory mem = mh.get();
@@ -81,7 +81,7 @@ public class CpcCBinariesTest {
@Test
public void checkHybridBin() {
- final String fileName = "cpc-hybrid.bin";
+ final String fileName = "cpc-hybrid.sk";
final File file = getResourceFile(fileName);
try (MapHandle mh = Memory.map(file)) {
final Memory mem = mh.get();
@@ -107,7 +107,7 @@ public class CpcCBinariesTest {
@Test
public void checkPinnedBin() {
- final String fileName = "cpc-pinned.bin";
+ final String fileName = "cpc-pinned.sk";
final File file = getResourceFile(fileName);
try (MapHandle mh = Memory.map(file)) {
final Memory mem = mh.get();
@@ -133,7 +133,7 @@ public class CpcCBinariesTest {
@Test
public void checkSlidingBin() {
- final String fileName = "cpc-sliding.bin";
+ final String fileName = "cpc-sliding.sk";
final File file = getResourceFile(fileName);
try (MapHandle mh = Memory.map(file)) {
final Memory mem = mh.get();
@@ -161,7 +161,7 @@ public class CpcCBinariesTest {
@Test
public void checkEmptyImages() {
- final String fileName = "cpc-empty.bin";
+ final String fileName = "cpc-empty.sk";
final File file = getResourceFile(fileName);
try (MapHandle mh = Memory.map(file)) {
final Memory mem = mh.get();
@@ -181,7 +181,7 @@ public class CpcCBinariesTest {
@Test
public void checkSparseImages() {
- final String fileName = "cpc-sparse.bin";
+ final String fileName = "cpc-sparse.sk";
final File file = getResourceFile(fileName);
try (MapHandle mh = Memory.map(file)) {
final Memory mem = mh.get();
@@ -202,7 +202,7 @@ public class CpcCBinariesTest {
@Test
public void checkHybridImages() {
- final String fileName = "cpc-hybrid.bin";
+ final String fileName = "cpc-hybrid.sk";
final File file = getResourceFile(fileName);
try (MapHandle mh = Memory.map(file)) {
final Memory mem = mh.get();
@@ -223,7 +223,7 @@ public class CpcCBinariesTest {
@Test
public void checkPinnedImages() {
- final String fileName = "cpc-pinned.bin";
+ final String fileName = "cpc-pinned.sk";
final File file = getResourceFile(fileName);
try (MapHandle mh = Memory.map(file)) {
final Memory mem = mh.get();
@@ -244,7 +244,7 @@ public class CpcCBinariesTest {
@Test
public void checkSlidingImages() {
- final String fileName = "cpc-sliding.bin";
+ final String fileName = "cpc-sliding.sk";
final File file = getResourceFile(fileName);
try (MapHandle mh = Memory.map(file)) {
final Memory mem = mh.get();
diff --git a/src/test/java/org/apache/datasketches/cpc/CpcSketchTest.java b/src/test/java/org/apache/datasketches/cpc/CpcSketchTest.java
index 4f20ada..d954692 100644
--- a/src/test/java/org/apache/datasketches/cpc/CpcSketchTest.java
+++ b/src/test/java/org/apache/datasketches/cpc/CpcSketchTest.java
@@ -232,7 +232,7 @@ public class CpcSketchTest {
sketch.update(v4);
assertEquals(sketch.getEstimate(), 1, 0.01);
// to compare with C++
- //org.apache.datasketches.tuple.TestUtil.writeBytesToFile(sketch.toByteArray(), "cpc-negative-one.bin");
+ //org.apache.datasketches.tuple.TestUtil.writeBytesToFile(sketch.toByteArray(), "cpc-negative-one.sk");
}
/**
diff --git a/src/test/java/org/apache/datasketches/cpc/SpecialCBinariesTest.java b/src/test/java/org/apache/datasketches/cpc/SpecialCBinariesTest.java
index f5c1382..e0f7234 100644
--- a/src/test/java/org/apache/datasketches/cpc/SpecialCBinariesTest.java
+++ b/src/test/java/org/apache/datasketches/cpc/SpecialCBinariesTest.java
@@ -46,7 +46,7 @@ public class SpecialCBinariesTest {
@Test
@SuppressWarnings("unused")
public void checkCpc10mBin() {
- String fileName = "cpc-10m.bin";
+ String fileName = "cpc-10m.sk";
File file = getResourceFile(fileName);
try (MapHandle mh = Memory.map(file)) {
Memory mem = mh.get();
@@ -74,7 +74,7 @@ public class SpecialCBinariesTest {
println(sk.toString(true));
println("Est: " + sk.getEstimate());
try {
- //byteArrToFile(byteArr, "FranksFile.bin");
+ //byteArrToFile(byteArr, "FranksFile.sk");
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
index bc1c6e5..facc32c 100644
--- a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
@@ -352,7 +352,7 @@ public class KllFloatsSketchTest {
@Test
public void deserializeOneItemV1() throws Exception {
- byte[] bytes = getResourceBytes("kll_sketch_float_one_item_v1.bin");
+ byte[] bytes = getResourceBytes("kll_sketch_float_one_item_v1.sk");
KllFloatsSketch sketch = KllFloatsSketch.heapify(Memory.wrap(bytes));
assertFalse(sketch.isEmpty());
assertFalse(sketch.isEstimationMode());
diff --git a/src/test/java/org/apache/datasketches/quantiles/ForwardCompatibilityTest.java b/src/test/java/org/apache/datasketches/quantiles/ForwardCompatibilityTest.java
index b39882c..98e1c82 100644
--- a/src/test/java/org/apache/datasketches/quantiles/ForwardCompatibilityTest.java
+++ b/src/test/java/org/apache/datasketches/quantiles/ForwardCompatibilityTest.java
@@ -30,7 +30,7 @@ public class ForwardCompatibilityTest {
private static final String LS = System.getProperty("line.separator");
@Test
- //fullPath: sketches/src/test/resources/Qk128_n50_v0.3.0.bin
+ //fullPath: sketches/src/test/resources/Qk128_n50_v0.3.0.sk
//Median2: 26.0
public void check030_50() {
int n = 50;
@@ -40,7 +40,7 @@ public class ForwardCompatibilityTest {
}
@Test
- //fullPath: sketches/src/test/resources/Qk128_n1000_v0.3.0.bin
+ //fullPath: sketches/src/test/resources/Qk128_n1000_v0.3.0.sk
//Median2: 501.0
public void check030_1000() {
int n = 1000;
@@ -50,7 +50,7 @@ public class ForwardCompatibilityTest {
}
@Test
- //fullPath: sketches/src/test/resources/Qk128_n50_v0.6.0.bin
+ //fullPath: sketches/src/test/resources/Qk128_n50_v0.6.0.sk
//Median2: 26.0
public void check060_50() {
int n = 50;
@@ -60,7 +60,7 @@ public class ForwardCompatibilityTest {
}
@Test
- //fullPath: sketches/src/test/resources/Qk128_n1000_v0.6.0.bin
+ //fullPath: sketches/src/test/resources/Qk128_n1000_v0.6.0.sk
//Median2: 501.0
public void check060_1000() {
int n = 1000;
@@ -70,7 +70,7 @@ public class ForwardCompatibilityTest {
}
@Test
- //fullPath: sketches/src/test/resources/Qk128_n50_v0.8.0.bin
+ //fullPath: sketches/src/test/resources/Qk128_n50_v0.8.0.sk
//Median2: 26.0
public void check080_50() {
int n = 50;
@@ -80,7 +80,7 @@ public class ForwardCompatibilityTest {
}
@Test
- //fullPath: sketches/src/test/resources/Qk128_n1000_v0.8.0.bin
+ //fullPath: sketches/src/test/resources/Qk128_n1000_v0.8.0.sk
//Median2: 501.0
public void check080_1000() {
int n = 1000;
@@ -90,7 +90,7 @@ public class ForwardCompatibilityTest {
}
@Test
- //fullPath: sketches/src/test/resources/Qk128_n50_v0.8.3.bin
+ //fullPath: sketches/src/test/resources/Qk128_n50_v0.8.3.sk
//Median2: 26.0
public void check083_50() {
int n = 50;
@@ -100,7 +100,7 @@ public class ForwardCompatibilityTest {
}
@Test
- //fullPath: sketches/src/test/resources/Qk128_n1000_v0.8.0.bin
+ //fullPath: sketches/src/test/resources/Qk128_n1000_v0.8.0.sk
//Median2: 501.0
public void check083_1000() {
int n = 1000;
@@ -114,7 +114,7 @@ public class ForwardCompatibilityTest {
//create fileName
int k = 128;
double nf = 0.5;
- String fileName = String.format("Qk%d_n%d_v%s.bin", k, n, ver);
+ String fileName = String.format("Qk%d_n%d_v%s.sk", k, n, ver);
println("fullName: "+ fileName);
println("Old Median: " + quantile);
//Read File bytes
diff --git a/src/test/java/org/apache/datasketches/sampling/ReservoirSizeTest.java b/src/test/java/org/apache/datasketches/sampling/ReservoirSizeTest.java
index 8f60188..2f73015 100644
--- a/src/test/java/org/apache/datasketches/sampling/ReservoirSizeTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/ReservoirSizeTest.java
@@ -23,12 +23,12 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import org.testng.annotations.Test;
-
import org.apache.datasketches.SketchesArgumentException;
+import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
public class ReservoirSizeTest {
+
@Test
public void checkComputeSize() {
short enc;
diff --git a/src/test/java/org/apache/datasketches/tuple/ArrayOfDoublesUnionTest.java b/src/test/java/org/apache/datasketches/tuple/ArrayOfDoublesUnionTest.java
index 85e8373..bd50be5 100644
--- a/src/test/java/org/apache/datasketches/tuple/ArrayOfDoublesUnionTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/ArrayOfDoublesUnionTest.java
@@ -204,13 +204,13 @@ public class ArrayOfDoublesUnionTest {
@Test(expectedExceptions = SketchesArgumentException.class)
public void noSupportHeapifyV0_9_1() throws Exception {
- final byte[] bytes = getResourceBytes("ArrayOfDoublesUnion_v0.9.1.bin");
+ final byte[] bytes = getResourceBytes("ArrayOfDoublesUnion_v0.9.1.sk");
ArrayOfDoublesUnion.heapify(Memory.wrap(bytes));
}
@Test(expectedExceptions = SketchesArgumentException.class)
public void noSupportWrapV0_9_1() throws Exception {
- final byte[] bytes = getResourceBytes("ArrayOfDoublesUnion_v0.9.1.bin");
+ final byte[] bytes = getResourceBytes("ArrayOfDoublesUnion_v0.9.1.sk");
ArrayOfDoublesUnion.wrap(WritableMemory.wrap(bytes));
}
diff --git a/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java b/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java
index ec2222b..c1820f3 100644
--- a/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java
@@ -156,8 +156,8 @@ public class CompactSketchWithDoubleSummaryTest {
CompactSketch<DoubleSummary> sketch1 = us.compact();
byte[] bytes = sketch1.toByteArray();
- // for visual testing
- //TestUtil.writeBytesToFile(bytes, "CompactSketchWithDoubleSummary4K.bin");
+ // for binary testing
+ //TestUtil.writeBytesToFile(bytes, "CompactSketchWithDoubleSummary4K.sk");
Sketch<DoubleSummary> sketch2 =
Sketches.heapifySketch(Memory.wrap(bytes), new DoubleSummaryDeserializer());
@@ -189,7 +189,7 @@ public class CompactSketchWithDoubleSummaryTest {
@Test
public void serialVersion1Compatibility() throws Exception {
- byte[] bytes = getResourceBytes("CompactSketchWithDoubleSummary4K_serialVersion1.bin");
+ byte[] bytes = getResourceBytes("CompactSketchWithDoubleSummary4K_serialVersion1.sk");
Sketch<DoubleSummary> sketch = Sketches.heapifySketch(Memory.wrap(bytes),
new DoubleSummaryDeserializer());
Assert.assertTrue(sketch.isEstimationMode());
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/UpdatableSketchWithDoubleSummaryTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/UpdatableSketchWithDoubleSummaryTest.java
index cfc4dcf..e78e404 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/UpdatableSketchWithDoubleSummaryTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/UpdatableSketchWithDoubleSummaryTest.java
@@ -360,8 +360,8 @@ public class UpdatableSketchWithDoubleSummaryTest {
sketch1.trim();
byte[] bytes = sketch1.toByteArray();
- //for visual testing
- //TestUtil.writeBytesToFile(bytes, "UpdatableSketchWithDoubleSummary4K.bin");
+ //for binary testing
+ //TestUtil.writeBytesToFile(bytes, "UpdatableSketchWithDoubleSummary4K.sk");
Sketch<DoubleSummary> sketch2 =
Sketches.heapifySketch(Memory.wrap(bytes), new DoubleSummaryDeserializer());
diff --git a/src/test/resources/ArrayOfDoublesUnion_v0.9.1.bin b/src/test/resources/ArrayOfDoublesUnion_v0.9.1.sk
similarity index 100%
rename from src/test/resources/ArrayOfDoublesUnion_v0.9.1.bin
rename to src/test/resources/ArrayOfDoublesUnion_v0.9.1.sk
diff --git a/src/test/resources/CompactSketchWithDoubleSummary4K_serialVersion1.bin b/src/test/resources/CompactSketchWithDoubleSummary4K_serialVersion1.sk
similarity index 100%
rename from src/test/resources/CompactSketchWithDoubleSummary4K_serialVersion1.bin
rename to src/test/resources/CompactSketchWithDoubleSummary4K_serialVersion1.sk
diff --git a/src/test/resources/Qk128_n1000_v0.3.0.bin b/src/test/resources/Qk128_n1000_v0.3.0.sk
similarity index 100%
rename from src/test/resources/Qk128_n1000_v0.3.0.bin
rename to src/test/resources/Qk128_n1000_v0.3.0.sk
diff --git a/src/test/resources/Qk128_n1000_v0.6.0.bin b/src/test/resources/Qk128_n1000_v0.6.0.sk
similarity index 100%
rename from src/test/resources/Qk128_n1000_v0.6.0.bin
rename to src/test/resources/Qk128_n1000_v0.6.0.sk
diff --git a/src/test/resources/Qk128_n1000_v0.8.0.bin b/src/test/resources/Qk128_n1000_v0.8.0.sk
similarity index 100%
rename from src/test/resources/Qk128_n1000_v0.8.0.bin
rename to src/test/resources/Qk128_n1000_v0.8.0.sk
diff --git a/src/test/resources/Qk128_n1000_v0.8.3.bin b/src/test/resources/Qk128_n1000_v0.8.3.sk
similarity index 100%
rename from src/test/resources/Qk128_n1000_v0.8.3.bin
rename to src/test/resources/Qk128_n1000_v0.8.3.sk
diff --git a/src/test/resources/Qk128_n50_v0.3.0.bin b/src/test/resources/Qk128_n50_v0.3.0.sk
similarity index 100%
rename from src/test/resources/Qk128_n50_v0.3.0.bin
rename to src/test/resources/Qk128_n50_v0.3.0.sk
diff --git a/src/test/resources/Qk128_n50_v0.6.0.bin b/src/test/resources/Qk128_n50_v0.6.0.sk
similarity index 100%
rename from src/test/resources/Qk128_n50_v0.6.0.bin
rename to src/test/resources/Qk128_n50_v0.6.0.sk
diff --git a/src/test/resources/Qk128_n50_v0.8.0.bin b/src/test/resources/Qk128_n50_v0.8.0.sk
similarity index 100%
rename from src/test/resources/Qk128_n50_v0.8.0.bin
rename to src/test/resources/Qk128_n50_v0.8.0.sk
diff --git a/src/test/resources/Qk128_n50_v0.8.3.bin b/src/test/resources/Qk128_n50_v0.8.3.sk
similarity index 100%
rename from src/test/resources/Qk128_n50_v0.8.3.bin
rename to src/test/resources/Qk128_n50_v0.8.3.sk
diff --git a/src/test/resources/cpc-10m.bin b/src/test/resources/cpc-10m.sk
similarity index 100%
rename from src/test/resources/cpc-10m.bin
rename to src/test/resources/cpc-10m.sk
diff --git a/src/test/resources/cpc-empty.bin b/src/test/resources/cpc-empty.sk
similarity index 100%
rename from src/test/resources/cpc-empty.bin
rename to src/test/resources/cpc-empty.sk
diff --git a/src/test/resources/cpc-hybrid.bin b/src/test/resources/cpc-hybrid.sk
similarity index 100%
rename from src/test/resources/cpc-hybrid.bin
rename to src/test/resources/cpc-hybrid.sk
diff --git a/src/test/resources/cpc-pinned.bin b/src/test/resources/cpc-pinned.sk
similarity index 100%
rename from src/test/resources/cpc-pinned.bin
rename to src/test/resources/cpc-pinned.sk
diff --git a/src/test/resources/cpc-sliding.bin b/src/test/resources/cpc-sliding.sk
similarity index 100%
rename from src/test/resources/cpc-sliding.bin
rename to src/test/resources/cpc-sliding.sk
diff --git a/src/test/resources/cpc-sparse.bin b/src/test/resources/cpc-sparse.sk
similarity index 100%
rename from src/test/resources/cpc-sparse.bin
rename to src/test/resources/cpc-sparse.sk
diff --git a/src/test/resources/kll_sketch_float_one_item_v1.bin b/src/test/resources/kll_sketch_float_one_item_v1.sk
similarity index 100%
rename from src/test/resources/kll_sketch_float_one_item_v1.bin
rename to src/test/resources/kll_sketch_float_one_item_v1.sk
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org