Fix errors detected by new TestNG 7.1.0.
diff --git a/src/test/java/org/apache/datasketches/pig/kll/GetQuantileTest.java b/src/test/java/org/apache/datasketches/pig/kll/GetQuantileTest.java
index bde55d2..31c8372 100644
--- a/src/test/java/org/apache/datasketches/pig/kll/GetQuantileTest.java
+++ b/src/test/java/org/apache/datasketches/pig/kll/GetQuantileTest.java
@@ -21,15 +21,12 @@
import java.util.Arrays;
+import org.apache.datasketches.kll.KllFloatsSketch;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.TupleFactory;
-
-import org.testng.annotations.Test;
-
-import org.apache.datasketches.kll.KllFloatsSketch;
-
import org.testng.Assert;
+import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
public class GetQuantileTest {
@@ -39,8 +36,9 @@
public void emptySketch() throws Exception {
final EvalFunc<Float> func = new GetQuantile();
final KllFloatsSketch sketch = new KllFloatsSketch();
- Float result = func.exec(TUPLE_FACTORY.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 0.0)));
- Assert.assertEquals(result, Float.NaN);
+ Float result =
+ func.exec(TUPLE_FACTORY.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 0.0)));
+ Assert.assertEquals((float)result, Float.NaN);
}
@Test
@@ -48,8 +46,9 @@
final EvalFunc<Float> func = new GetQuantile();
final KllFloatsSketch sketch = new KllFloatsSketch();
sketch.update(1);
- final Float result = func.exec(TUPLE_FACTORY.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 0.5)));
- Assert.assertEquals(result, 1f);
+ final Float result =
+ func.exec(TUPLE_FACTORY.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 0.5)));
+ Assert.assertEquals((float)result, 1f);
}
@Test(expectedExceptions = IllegalArgumentException.class)
diff --git a/src/test/java/org/apache/datasketches/pig/kll/GetRankTest.java b/src/test/java/org/apache/datasketches/pig/kll/GetRankTest.java
index 88fc9d7..83715eb 100644
--- a/src/test/java/org/apache/datasketches/pig/kll/GetRankTest.java
+++ b/src/test/java/org/apache/datasketches/pig/kll/GetRankTest.java
@@ -21,15 +21,12 @@
import java.util.Arrays;
+import org.apache.datasketches.kll.KllFloatsSketch;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.TupleFactory;
-
-import org.testng.annotations.Test;
-
-import org.apache.datasketches.kll.KllFloatsSketch;
-
import org.testng.Assert;
+import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
public class GetRankTest {
@@ -39,8 +36,9 @@
public void emptySketch() throws Exception {
final EvalFunc<Double> func = new GetRank();
final KllFloatsSketch sketch = new KllFloatsSketch();
- final Double result = func.exec(TUPLE_FACTORY.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 0f)));
- Assert.assertEquals(result, Double.NaN);
+ final Double result =
+ func.exec(TUPLE_FACTORY.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 0f)));
+ Assert.assertEquals((double)result, Double.NaN);
}
@Test
@@ -51,8 +49,9 @@
sketch.update(2);
sketch.update(3);
sketch.update(4);
- final Double result = func.exec(TUPLE_FACTORY.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 3f)));
- Assert.assertEquals(result, 0.5);
+ final Double result =
+ func.exec(TUPLE_FACTORY.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 3f)));
+ Assert.assertEquals((double)result, 0.5);
}
@Test(expectedExceptions = IllegalArgumentException.class)
diff --git a/src/test/java/org/apache/datasketches/pig/quantiles/GetQuantileFromDoublesSketchTest.java b/src/test/java/org/apache/datasketches/pig/quantiles/GetQuantileFromDoublesSketchTest.java
index afa026d..7560948 100644
--- a/src/test/java/org/apache/datasketches/pig/quantiles/GetQuantileFromDoublesSketchTest.java
+++ b/src/test/java/org/apache/datasketches/pig/quantiles/GetQuantileFromDoublesSketchTest.java
@@ -19,17 +19,15 @@
package org.apache.datasketches.pig.quantiles;
-import org.apache.datasketches.quantiles.DoublesSketch;
-import org.apache.datasketches.quantiles.UpdateDoublesSketch;
-
import java.util.Arrays;
+import org.apache.datasketches.quantiles.DoublesSketch;
+import org.apache.datasketches.quantiles.UpdateDoublesSketch;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.TupleFactory;
-
-import org.testng.annotations.Test;
import org.testng.Assert;
+import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
public class GetQuantileFromDoublesSketchTest {
@@ -39,8 +37,9 @@
public void emptySketch() throws Exception {
EvalFunc<Double> func = new GetQuantileFromDoublesSketch();
DoublesSketch sketch = DoublesSketch.builder().build();
- Double result = func.exec(tupleFactory.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 0.0)));
- Assert.assertEquals(result, Double.NaN);
+ Double result =
+ func.exec(tupleFactory.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 0.0)));
+ Assert.assertEquals((double)result, Double.NaN);
}
@Test
@@ -48,8 +47,9 @@
EvalFunc<Double> func = new GetQuantileFromDoublesSketch();
UpdateDoublesSketch sketch = DoublesSketch.builder().build();
sketch.update(1.0);
- Double result = func.exec(tupleFactory.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 0.5)));
- Assert.assertEquals(result, 1.0);
+ Double result =
+ func.exec(tupleFactory.newTuple(Arrays.asList(new DataByteArray(sketch.toByteArray()), 0.5)));
+ Assert.assertEquals((double)result, 1.0);
}
@Test(expectedExceptions = IllegalArgumentException.class)
diff --git a/src/test/java/org/apache/datasketches/pig/sampling/VarOptCommonAlgebraicTest.java b/src/test/java/org/apache/datasketches/pig/sampling/VarOptCommonAlgebraicTest.java
index 68c9dd0..d67f7a0 100644
--- a/src/test/java/org/apache/datasketches/pig/sampling/VarOptCommonAlgebraicTest.java
+++ b/src/test/java/org/apache/datasketches/pig/sampling/VarOptCommonAlgebraicTest.java
@@ -28,6 +28,10 @@
import java.io.IOException;
import java.util.HashMap;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.sampling.VarOptItemsSamples;
+import org.apache.datasketches.sampling.VarOptItemsSketch;
+import org.apache.datasketches.sampling.VarOptItemsUnion;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.data.BagFactory;
import org.apache.pig.data.DataBag;
@@ -36,11 +40,6 @@
import org.apache.pig.data.TupleFactory;
import org.testng.annotations.Test;
-import org.apache.datasketches.memory.Memory;
-import org.apache.datasketches.sampling.VarOptItemsSamples;
-import org.apache.datasketches.sampling.VarOptItemsSketch;
-import org.apache.datasketches.sampling.VarOptItemsUnion;
-
@SuppressWarnings("javadoc")
public class VarOptCommonAlgebraicTest {
private static final ArrayOfTuplesSerDe serDe_ = new ArrayOfTuplesSerDe();
@@ -168,7 +167,7 @@
final DataBag inputBag = BagFactory.getInstance().newDefaultBag();
try {
- for (int i = 0; i < (k + 1); ++i) {
+ for (int i = 0; i < k + 1; ++i) {
final Tuple t = TupleFactory.getInstance().newTuple(2);
t.set(0, Character.toString(id));
t.set(1, wt);
@@ -210,7 +209,7 @@
for (VarOptItemsSamples<Tuple>.WeightedSample ws : vis.getSketchSamples()) {
final Tuple t = ws.getItem();
assertTrue((double) t.get(wtIdx) >= 1.0);
- assertTrue((double) t.get(wtIdx) <= (k + 1.0));
+ assertTrue((double) t.get(wtIdx) <= k + 1.0);
}
} catch (final IOException e) {
fail("Unexpected IOException calling exec()");
@@ -333,7 +332,7 @@
}
for (VarOptItemsSamples<Tuple>.WeightedSample ws : s2.getSketchSamples()) {
- assertEquals(items.get(ws.getItem()), ws.getWeight());
+ assertEquals((double)items.get(ws.getItem()), ws.getWeight());
}
}
