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 2021/01/05 00:18:14 UTC
[datasketches-java] branch master updated (430b73f -> b57db7e)
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git.
from 430b73f Merge pull request #343 from apache/Update_to_TLP
new 4dea819 Update TestNG to 7.3.0.
new b57db7e Eclipse is incompatible with latest TestNG 7.3.0, have to back-off to 7.1.0.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
.../java/org/apache/datasketches/UtilTest.java | 6 +++---
.../datasketches/kll/KllFloatsSketchTest.java | 4 ++--
.../apache/datasketches/theta/AnotBimplTest.java | 24 +++++++++++-----------
.../datasketches/theta/DirectIntersectionTest.java | 8 ++++----
.../datasketches/theta/HeapIntersectionTest.java | 8 ++++----
.../datasketches/tuple/adouble/FilterTest.java | 2 +-
7 files changed, 27 insertions(+), 27 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[datasketches-java] 01/02: Update TestNG to 7.3.0.
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
commit 4dea819b01bced4050d4d84ffd86e2eabd270943
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Mon Jan 4 12:57:03 2021 -0800
Update TestNG to 7.3.0.
minor: removing explicit casts where not needed.
---
pom.xml | 2 +-
.../java/org/apache/datasketches/UtilTest.java | 6 +++---
.../datasketches/kll/KllFloatsSketchTest.java | 4 ++--
.../apache/datasketches/theta/AnotBimplTest.java | 24 +++++++++++-----------
.../datasketches/theta/DirectIntersectionTest.java | 8 ++++----
.../datasketches/theta/HeapIntersectionTest.java | 8 ++++----
.../datasketches/tuple/adouble/FilterTest.java | 2 +-
7 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index c0ce6b6..4d42046 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@ under the License.
<!-- END:UNIQUE FOR THIS JAVA COMPONENT -->
<!-- Test -->
- <testng.version>6.14.3</testng.version>
+ <testng.version>7.3.0</testng.version>
<!-- System-wide properties -->
<maven.version>3.0.0</maven.version>
diff --git a/src/test/java/org/apache/datasketches/UtilTest.java b/src/test/java/org/apache/datasketches/UtilTest.java
index 60ee955..db99aa2 100644
--- a/src/test/java/org/apache/datasketches/UtilTest.java
+++ b/src/test/java/org/apache/datasketches/UtilTest.java
@@ -166,9 +166,9 @@ public class UtilTest {
Assert.assertEquals(floorPowerOfBdouble(2.0, 3.0), 2.0);
Assert.assertEquals(floorPowerOfBdouble(2.0, 4.0), 4.0);
- Assert.assertEquals(floorPowerOfBdouble(2.0, (1 << 30) - 1.0), (double)(1 << 29));
- Assert.assertEquals(floorPowerOfBdouble(2.0, 1 << 30), (double)(1 << 30));
- Assert.assertEquals(floorPowerOfBdouble(2.0, (1 << 30) + 1.0), (double)(1L << 30));
+ Assert.assertEquals(floorPowerOfBdouble(2.0, (1 << 30) - 1.0), 1 << 29);
+ Assert.assertEquals(floorPowerOfBdouble(2.0, 1 << 30), 1 << 30);
+ Assert.assertEquals(floorPowerOfBdouble(2.0, (1 << 30) + 1.0), 1L << 30);
}
@Test(expectedExceptions = SketchesArgumentException.class)
diff --git a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
index 3df3103..a8ab1bd 100644
--- a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
@@ -164,7 +164,7 @@ public class KllFloatsSketchTest {
assertEquals(sketch1.getMinValue(), 0.0f);
assertEquals(sketch1.getMaxValue(), n - 1f);
- assertEquals(sketch2.getMinValue(), (float)n);
+ assertEquals(sketch2.getMinValue(), n);
assertEquals(sketch2.getMaxValue(), 2f * n - 1f);
sketch1.merge(sketch2);
@@ -189,7 +189,7 @@ public class KllFloatsSketchTest {
assertEquals(sketch1.getMinValue(), 0.0f);
assertEquals(sketch1.getMaxValue(), n - 1f);
- assertEquals(sketch2.getMinValue(), (float)n);
+ assertEquals(sketch2.getMinValue(), n);
assertEquals(sketch2.getMaxValue(), 2f * n - 1f);
assertTrue(sketch1.getNormalizedRankError(false) < sketch2.getNormalizedRankError(false));
diff --git a/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java b/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java
index 2cdf1fd..0380892 100644
--- a/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java
+++ b/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java
@@ -142,62 +142,62 @@ public class AnotBimplTest {
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aC, bEmpty, !ordered, null);
- assertEquals(result.getEstimate(), (double)k);
+ assertEquals(result.getEstimate(), k);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aC, bC, !ordered, null);
- assertEquals(result.getEstimate(), (double) k/2);
+ assertEquals(result.getEstimate(), k / 2.0);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aC, bO, !ordered, null);
- assertEquals(result.getEstimate(), (double) k/2);
+ assertEquals(result.getEstimate(), k / 2.0);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aC, bHT, !ordered, null);
- assertEquals(result.getEstimate(), (double) k/2);
+ assertEquals(result.getEstimate(), k / 2.0);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aO, bEmpty, !ordered, null);
- assertEquals(result.getEstimate(), (double)k);
+ assertEquals(result.getEstimate(), k);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aO, bC, !ordered, null);
- assertEquals(result.getEstimate(), (double) k/2);
+ assertEquals(result.getEstimate(), k / 2.0);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aO, bO, !ordered, null);
- assertEquals(result.getEstimate(), (double) k/2);
+ assertEquals(result.getEstimate(), k / 2.0);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aO, bHT, !ordered, null);
- assertEquals(result.getEstimate(), (double) k/2);
+ assertEquals(result.getEstimate(), k / 2.0);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aHT, bEmpty, !ordered, null);
- assertEquals(result.getEstimate(), (double)k);
+ assertEquals(result.getEstimate(), k);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aHT, bC, !ordered, null);
- assertEquals(result.getEstimate(), (double) k/2);
+ assertEquals(result.getEstimate(), k / 2.0);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aHT, bO, !ordered, null);
- assertEquals(result.getEstimate(), (double) k/2);
+ assertEquals(result.getEstimate(), k / 2.0);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
result = aNb.aNotB(aHT, bHT, !ordered, null);
- assertEquals(result.getEstimate(), (double) k/2);
+ assertEquals(result.getEstimate(), k / 2.0);
assertFalse(result.isEmpty());
assertEquals(result.getThetaLong(), Long.MAX_VALUE);
}
diff --git a/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java b/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java
index ff912ae..5bbd384 100644
--- a/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java
+++ b/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java
@@ -121,20 +121,20 @@ public class DirectIntersectionTest {
final boolean ordered = true;
rsk1 = inter.getResult(!ordered, null);
- assertEquals(rsk1.getEstimate(), (double)k);
+ assertEquals(rsk1.getEstimate(), k);
rsk1 = inter.getResult(ordered, null);
- assertEquals(rsk1.getEstimate(), (double)k);
+ assertEquals(rsk1.getEstimate(), k);
final int bytes = rsk1.getCompactBytes();
final byte[] byteArray = new byte[bytes];
final WritableMemory mem = WritableMemory.wrap(byteArray);
rsk1 = inter.getResult(!ordered, mem); //executed twice to fully exercise the internal state machine
- assertEquals(rsk1.getEstimate(), (double)k);
+ assertEquals(rsk1.getEstimate(), k);
rsk1 = inter.getResult(ordered, mem);
- assertEquals(rsk1.getEstimate(), (double)k);
+ assertEquals(rsk1.getEstimate(), k);
}
@Test
diff --git a/src/test/java/org/apache/datasketches/theta/HeapIntersectionTest.java b/src/test/java/org/apache/datasketches/theta/HeapIntersectionTest.java
index 497817a..2a63c7d 100644
--- a/src/test/java/org/apache/datasketches/theta/HeapIntersectionTest.java
+++ b/src/test/java/org/apache/datasketches/theta/HeapIntersectionTest.java
@@ -109,20 +109,20 @@ public class HeapIntersectionTest {
final boolean ordered = true;
rsk1 = inter.getResult(!ordered, null);
- assertEquals(rsk1.getEstimate(), (double)k);
+ assertEquals(rsk1.getEstimate(), k);
rsk1 = inter.getResult(ordered, null);
- assertEquals(rsk1.getEstimate(), (double)k);
+ assertEquals(rsk1.getEstimate(), k);
final int bytes = rsk1.getCompactBytes();
final byte[] byteArray = new byte[bytes];
final WritableMemory mem = WritableMemory.wrap(byteArray);
rsk1 = inter.getResult(!ordered, mem); //executed twice to fully exercise the internal state machine
- assertEquals(rsk1.getEstimate(), (double)k);
+ assertEquals(rsk1.getEstimate(), k);
rsk1 = inter.getResult(ordered, mem);
- assertEquals(rsk1.getEstimate(), (double)k);
+ assertEquals(rsk1.getEstimate(), k);
}
@Test
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java
index de1f291..7cb62a8 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java
@@ -94,7 +94,7 @@ public class FilterTest {
final Sketch<DoubleSummary> filteredSketch = filter.filter(sketch);
- Assert.assertEquals(filteredSketch.getEstimate(), (double)numberOfElements);
+ Assert.assertEquals(filteredSketch.getEstimate(), numberOfElements);
Assert.assertEquals(filteredSketch.getThetaLong(), sketch.getThetaLong());
Assert.assertFalse(filteredSketch.isEmpty());
Assert.assertTrue(filteredSketch.getLowerBound(1) <= filteredSketch.getEstimate());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[datasketches-java] 02/02: Eclipse is incompatible with latest
TestNG 7.3.0, have to back-off to 7.1.0.
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
commit b57db7e20c011eb1c97f807e473224ab192180cd
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Mon Jan 4 16:17:57 2021 -0800
Eclipse is incompatible with latest TestNG 7.3.0, have to back-off to
7.1.0.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4d42046..92c1938 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@ under the License.
<!-- END:UNIQUE FOR THIS JAVA COMPONENT -->
<!-- Test -->
- <testng.version>7.3.0</testng.version>
+ <testng.version>7.1.0</testng.version>
<!-- System-wide properties -->
<maven.version>3.0.0</maven.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org