Apache Solr open-source search software
SOLR-16427: Evaluate and fix errorprone rules - FloatingPointLiteralPrecision
Kevin Risden9a9ab920ebe2
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradleindex a3f0054e363..91af1e2fd0f 100644--- a/gradle/validation/error-prone.gradle+++ b/gradle/validation/error-prone.gradle@@ -70,7 +70,6 @@ allprojects { prj ->'-Xep:CatchFail:OFF', // our code is generally descriptive enough, fix case by case if tests fail'-Xep:JUnit4TestNotRun:OFF', // RandomizedRunner finds unannotated test methods no problem'-Xep:CatchAndPrintStackTrace:OFF', // TODO: there's a lot of these but they should be easy to address- '-Xep:FloatingPointLiteralPrecision:OFF', // TODO: a lot of these in our tests, likely unintentional'-Xep:StaticAssignmentInConstructor:OFF', // we assign SolrTestCaseJ4.configString in many tests, difficult to untangle'-Xep:ComparableType:OFF', // SolrTestCaseJ4.Doc and Fld are messydiff --git a/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java b/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.javaindex b05aaf248d4..ede3b8f2b8f 100644--- a/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java+++ b/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java@@ -265,7 +265,7 @@ public class TestLegacyNumericUtils extends SolrTestCase {new float[] {Float.NEGATIVE_INFINITY,-2.3E25f,- -1.0E15f,+ -9.9999999E+14f,-1.0f,-1.0E-1f,-1.0E-2f,@@ -274,7 +274,7 @@ public class TestLegacyNumericUtils extends SolrTestCase {1.0E-2f,1.0E-1f,1.0f,- 1.0E15f,+ 9.9999999E+14f,2.3E25f,Float.POSITIVE_INFINITY,Float.NaNdiff --git a/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java b/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.javaindex bbce37c1678..398509f0c04 100644--- a/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java@@ -497,7 +497,7 @@ public class ParsingFieldUpdateProcessorsTest extends UpdateProcessorTestBase {IndexSchema schema = h.getCore().getLatestSchema();assertNotNull(schema.getFieldOrNull("float1_f")); // should match dynamic field "*_f"assertNotNull(schema.getFieldOrNull("float2_f")); // should match dynamic field "*_f"- float value = 10898.83491f;+ float value = 10898.835f;String floatString1 = "10898.83491";String floatString2 = "10,898.83491";SolrInputDocument d =@@ -522,7 +522,7 @@ public class ParsingFieldUpdateProcessorsTest extends UpdateProcessorTestBase {final char groupChar = fr_FR.getGroupingSeparator();final char decimalChar = fr_FR.getDecimalSeparator();- float value = 10898.83491F;+ float value = 10898.835F;String floatString1 = "10898" + decimalChar + "83491";String floatString2 = "10" + groupChar + "898" + decimalChar + "83491";@@ -544,7 +544,7 @@ public class ParsingFieldUpdateProcessorsTest extends UpdateProcessorTestBase {IndexSchema schema = h.getCore().getLatestSchema();assertNotNull(schema.getFieldOrNull("float1_tf")); // should match dynamic field "*_tf"assertNotNull(schema.getFieldOrNull("float2_tf")); // should match dynamic field "*_tf"- float value = 10898.83491f;+ float value = 10898.835f;String floatString1 = "10898.83491";String floatString2 = "10,898.83491";SolrInputDocument d =@@ -571,7 +571,7 @@ public class ParsingFieldUpdateProcessorsTest extends UpdateProcessorTestBase {mixedFloats.put(85.0f, "85");mixedFloats.put(2894518.0f, "2,894,518");mixedFloats.put(2.94423E-9f, 2.94423E-9f); // Float-typed field value- mixedFloats.put(48794721.937f, "48,794,721.937");+ mixedFloats.put(4.879472E+7f, "48,794,721.937");SolrInputDocument d =processAdd("parse-float-no-run-processor",diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.javaindex eb0b560b54e..e81c1ed2386 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.java@@ -233,18 +233,18 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {// Value existsval.setValue(-21.324F).setExists(true);- filler.setValue(23423.423342F).setExists(true);+ filler.setValue(23423.424F).setExists(true);assertEquals(-21.324F, func.getFloat(), .00000001);assertTrue(func.exists());val.setExists(false);- filler.setValue(3124123.32F).setExists(true);- assertEquals(3124123.32F, func.getFloat(), .00000001);+ filler.setValue(3124123.2F).setExists(true);+ assertEquals(3124123.2F, func.getFloat(), .00000001);assertTrue(func.exists());- val.setValue(2345.345543F).setExists(true);+ val.setValue(2345.3455F).setExists(true);filler.setExists(false);- assertEquals(2345.345543F, func.getFloat(), .00000001);+ assertEquals(2345.3455F, func.getFloat(), .00000001);assertTrue(func.exists());}@@ -554,7 +554,7 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {// Values existval.setValues(323.213F, -9423.5F);- filler.setValues(-1234.9478F, -5433.234F, -73843F, 1245144.2342F);+ filler.setValues(-1234.9478F, -5433.234F, -73843F, 1245144.2F);Iterator<Float> values1 = Arrays.asList(323.213F, -9423.5F).iterator();func.streamFloats(value -> {@@ -564,8 +564,8 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {assertFalse(values1.hasNext());val.setValues();- filler.setValues(-312423.2F, 12343.234823F, 23.582F, 2.23F);- Iterator<Float> values2 = Arrays.asList(-312423.2F, 12343.234823F, 23.582F, 2.23F).iterator();+ filler.setValues(-312423.2F, 12343.234F, 23.582F, 2.23F);+ Iterator<Float> values2 = Arrays.asList(-312423.2F, 12343.234F, 23.582F, 2.23F).iterator();func.streamFloats(value -> {assertTrue(values2.hasNext());@@ -573,9 +573,9 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {});assertFalse(values2.hasNext());- val.setValues(1423.23039F, -413543F);+ val.setValues(1423.2303F, -413543F);filler.setValues();- Iterator<Float> values3 = Arrays.asList(1423.23039F, -413543F).iterator();+ Iterator<Float> values3 = Arrays.asList(1423.2303F, -413543F).iterator();func.streamFloats(value -> {assertTrue(values3.hasNext());diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.javaindex cf272e996cb..1bb79882d93 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.java@@ -715,7 +715,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {fail("There should be no values to stream");});- val.setValues(50.343F, -74.9874F, 2342332342.32F);+ val.setValues(50.343F, -74.9874F, 2.34233242E+9F);filter.setExists(false);func.streamFloats(value -> {diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.javaindex 50e970fe74b..9b1a9fd50a6 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.java@@ -522,7 +522,7 @@ public class IfFunctionTest extends SolrTestCaseJ4 {assertFalse(func.exists());cond.setValue(false).setExists(true);- then.setValue(1234324.454F).setExists(true);+ then.setValue(1234324.5F).setExists(true);els.setExists(false);func.getObject();assertFalse(func.exists());@@ -769,7 +769,7 @@ public class IfFunctionTest extends SolrTestCaseJ4 {});cond.setExists(false);- then.setValues(2134.2345F, -234.23F, 20000.0F);+ then.setValues(2134.2346F, -234.23F, 20000.0F);els.setValues(.1111F, -.22222F, .333F);func.streamFloats(value -> {@@ -786,7 +786,7 @@ public class IfFunctionTest extends SolrTestCaseJ4 {});cond.setValue(false).setExists(true);- then.setValues(2134.2345F, -234.23F, 20000.0F);+ then.setValues(2134.2346F, -234.23F, 20000.0F);els.setValues();func.streamFloats(value -> {@@ -795,9 +795,9 @@ public class IfFunctionTest extends SolrTestCaseJ4 {// Values existcond.setValue(true).setExists(true);- then.setValues(2134.2345F, -234.23F, 20000.0F);+ then.setValues(2134.2346F, -234.23F, 20000.0F);els.setValues(.1111F, -.22222F, .333F);- Iterator<Float> values1 = Arrays.asList(2134.2345F, -234.23F, 20000.0F).iterator();+ Iterator<Float> values1 = Arrays.asList(2134.2346F, -234.23F, 20000.0F).iterator();func.streamFloats(value -> {assertTrue(values1.hasNext());@@ -806,7 +806,7 @@ public class IfFunctionTest extends SolrTestCaseJ4 {assertFalse(values1.hasNext());cond.setValue(false).setExists(true);- then.setValues(2134.2345F, -234.23F, 20000.0F);+ then.setValues(2134.2346F, -234.23F, 20000.0F);els.setValues(.1111F, -.22222F, .333F);Iterator<Float> values2 = Arrays.asList(.1111F, -.22222F, .333F).iterator();func.streamFloats(@@ -1049,7 +1049,7 @@ public class IfFunctionTest extends SolrTestCaseJ4 {cond.setExists(false);then.setValues(new Date(142341), "abcsdafasd", 1234.1324123);- els.setValues(324923.0234F, 123, Boolean.TRUE, "if statement");+ els.setValues(324923.03F, 123, Boolean.TRUE, "if statement");func.streamObjects(value -> {fail("There should be no values to stream");@@ -1058,7 +1058,7 @@ public class IfFunctionTest extends SolrTestCaseJ4 {// Result doesn't existcond.setValue(true).setExists(true);then.setValues();- els.setValues(324923.0234F, 123, Boolean.TRUE, "if statement");+ els.setValues(324923.03F, 123, Boolean.TRUE, "if statement");func.streamObjects(value -> {fail("There should be no values to stream");@@ -1075,7 +1075,7 @@ public class IfFunctionTest extends SolrTestCaseJ4 {// Values existcond.setValue(true).setExists(true);then.setValues(new Date(142341), "abcsdafasd", 1234.1324123);- els.setValues(324923.0234F, 123, Boolean.TRUE, "if statement");+ els.setValues(324923.03F, 123, Boolean.TRUE, "if statement");Iterator<Object> values1 =Arrays.<Object>asList(new Date(142341), "abcsdafasd", 1234.1324123).iterator();func.streamObjects(@@ -1087,9 +1087,9 @@ public class IfFunctionTest extends SolrTestCaseJ4 {cond.setValue(false).setExists(true);then.setValues(new Date(142341), "abcsdafasd", 1234.1324123);- els.setValues(324923.0234F, 123, Boolean.TRUE, "if statement");+ els.setValues(324923.03F, 123, Boolean.TRUE, "if statement");Iterator<Object> values2 =- Arrays.<Object>asList(324923.0234F, 123, Boolean.TRUE, "if statement").iterator();+ Arrays.<Object>asList(324923.03F, 123, Boolean.TRUE, "if statement").iterator();func.streamObjects(value -> {assertTrue(values2.hasNext());diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.javaindex 85990332cae..3d157caf4eb 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.java@@ -242,24 +242,24 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {assertFalse(func.exists());val.setExists(false);- remover.setValue(3124123.32F).setExists(true);+ remover.setValue(3124123.2F).setExists(true);func.getFloat();assertFalse(func.exists());// Value existsval.setValue(-21.324F).setExists(true);- remover.setValue(23423.423342F).setExists(true);+ remover.setValue(23423.424F).setExists(true);assertEquals(-21.324F, func.getFloat(), .00000001);assertTrue(func.exists());- val.setValue(84353.452F).setExists(true);- remover.setValue(84353.452F).setExists(true);+ val.setValue(84353.45F).setExists(true);+ remover.setValue(84353.45F).setExists(true);func.getFloat();assertFalse(func.exists());- val.setValue(2345.345543F).setExists(true);+ val.setValue(2345.3455F).setExists(true);remover.setExists(false);- assertEquals(2345.345543F, func.getFloat(), .00000001);+ assertEquals(2345.3455F, func.getFloat(), .00000001);assertTrue(func.exists());}@@ -659,7 +659,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {assertFalse(values2.hasNext());val.setValues(-1234.9478F, -9423.5F, -1234.9478F, 23423.324F, 942.0F);- remover.setValue(23423.5845F).setExists(true);+ remover.setValue(23423.584F).setExists(true);Iterator<Float> values3 =Arrays.asList(-1234.9478F, -9423.5F, -1234.9478F, 23423.324F, 942.0F).iterator();func.streamFloats(diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.javaindex 079bdabba08..a6eaa1a1ac0 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.java@@ -300,7 +300,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {assertFalse(func.exists());val.setExists(false);- comp.setValue(3124123.32F).setExists(true);+ comp.setValue(3124123.2F).setExists(true);fill.setValue(-32473.336F).setExists(true);func.getFloat();assertFalse(func.exists());@@ -333,8 +333,8 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {func.getFloat();assertFalse(func.exists());- fill.setValue(4353434.234F).setExists(true);- assertEquals(4353434.234F, func.getFloat(), .0000001);+ fill.setValue(4353434.0F).setExists(true);+ assertEquals(4353434.0F, func.getFloat(), .0000001);assertTrue(func.exists());}@@ -783,18 +783,18 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {val.setValues();comp.setValue(-230.32F).setExists(true);- fill.setValue(9459.3458F).setExists(true);+ fill.setValue(9459.346F).setExists(true);func.streamFloats(value -> {fail("There should be no values to stream");});// Comp doesn't exist- val.setValues(1423.3F, 423.4323F, -2349.2F, -343.43934F, 423.4323F);+ val.setValues(1423.3F, 423.4323F, -2349.2F, -343.43933F, 423.4323F);comp.setExists(false);fill.setValue(234.234F).setExists(true);Iterator<Float> values1 =- Arrays.asList(1423.3F, 423.4323F, -2349.2F, -343.43934F, 423.4323F).iterator();+ Arrays.asList(1423.3F, 423.4323F, -2349.2F, -343.43933F, 423.4323F).iterator();func.streamFloats(value -> {assertTrue(values1.hasNext());@@ -803,10 +803,10 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {assertFalse(values1.hasNext());// Values exist- val.setValues(1423.3F, 423.4323F, -2349.2F, -343.43934F, 423.4323F);+ val.setValues(1423.3F, 423.4323F, -2349.2F, -343.43933F, 423.4323F);comp.setValue(423.4323F).setExists(true);fill.setExists(false);- Iterator<Float> values2 = Arrays.asList(1423.3F, -2349.2F, -343.43934F).iterator();+ Iterator<Float> values2 = Arrays.asList(1423.3F, -2349.2F, -343.43933F).iterator();func.streamFloats(value -> {assertTrue(values2.hasNext());@@ -814,11 +814,11 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {});assertFalse(values2.hasNext());- val.setValues(1423.3F, 423.4323F, -2349.2F, -343.43934F, 423.4323F);+ val.setValues(1423.3F, 423.4323F, -2349.2F, -343.43933F, 423.4323F);comp.setValue(423.4323F).setExists(true);fill.setValue(-1000F).setExists(true);Iterator<Float> values3 =- Arrays.asList(1423.3F, -1000F, -2349.2F, -343.43934F, -1000F).iterator();+ Arrays.asList(1423.3F, -1000F, -2349.2F, -343.43933F, -1000F).iterator();func.streamFloats(value -> {assertTrue(values3.hasNext());diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.javaindex 288f81e9128..12e774f593a 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java@@ -2250,7 +2250,7 @@ public class MathExpressionTest extends SolrCloudTestCase {@SuppressWarnings({"unchecked"})List<Number> array4 = (List<Number>) tuples.get(0).get("c");assertEquals(array4.size(), 3);- assertEquals(array4.get(0).doubleValue(), 16.666666666666666, 0.0001);+ assertEquals(array4.get(0).doubleValue(), 16.666666666666664, 0.0001);assertEquals(array4.get(1).doubleValue(), 33.33333333333333, 0.00001);assertEquals(array4.get(2).doubleValue(), 50, 0.0001);}@@ -3725,7 +3725,7 @@ public class MathExpressionTest extends SolrCloudTestCase {Number mean = (Number) tuples.get(0).get("b");assertEquals(mean.doubleValue(), 3.3800151591412964, 0.0);Number mean1 = (Number) tuples.get(0).get("d");- assertEquals(mean1.doubleValue(), 4.3800151591412964, 0.0);+ assertEquals(mean1.doubleValue(), 4.380015159141297, 0.0);@SuppressWarnings({"unchecked"})List<Number> vals = (List<Number>) tuples.get(0).get("f");assertEquals(vals.size(), 3);diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.javaindex 9804417f4ee..a802e266900 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java@@ -46,21 +46,22 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("a", 1);values.put("b", 2);result = evaluator.evaluate(new Tuple(values));- assertEquals(3D, result);+ assertTrue(result instanceof Double);+ assertEquals(3D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);values.put("b", 2);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(3.1D, result);+ assertEquals(3.1D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);values.put("b", 2.1);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(3.2D, result);+ assertEquals(3.2D, (Double) result, 0.000000001);}@Test // (expected = NumberFormatException.class)@@ -129,7 +130,8 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("c", 3);values.put("d", 4);result = evaluator.evaluate(new Tuple(values));- assertEquals(10D, result);+ assertTrue(result instanceof Double);+ assertEquals(10D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);@@ -138,7 +140,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 4);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(10.1D, result);+ assertEquals(10.1D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);@@ -147,7 +149,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 4.1);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(10.4D, result);+ assertEquals(10.4D, (Double) result, 0.000000001);}@Test@@ -161,7 +163,8 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("c", 3);values.put("d", 4);result = evaluator.evaluate(new Tuple(values));- assertEquals(10D, result);+ assertTrue(result instanceof Double);+ assertEquals(10D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);@@ -170,7 +173,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 4);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(10.1D, result);+ assertEquals(10.1D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);@@ -179,7 +182,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 4.1);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(10.4D, result);+ assertEquals(10.4D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);@@ -188,7 +191,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 4.123456789123456);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(10.423456789123456, result);+ assertEquals(10.423456789123456D, (Double) result, 0.000000001);values.clear();values.put("a", 123456789123456789L);@@ -196,7 +199,8 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("c", 123456789123456789L);values.put("d", 123456789123456789L);result = evaluator.evaluate(new Tuple(values));- assertEquals(4 * 123456789123456789D, result);+ assertTrue(result instanceof Double);+ assertEquals(4 * 123456789123456784D, (Double) result, 0);}@Test@@ -210,7 +214,8 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("c", 3);values.put("d", 4);result = evaluator.evaluate(new Tuple(values));- assertEquals(14D, result);+ assertTrue(result instanceof Double);+ assertEquals(14D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);@@ -219,7 +224,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 4);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(14.2D, result);+ assertEquals(14.2D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);@@ -228,7 +233,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 4.1);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(14.6D, result);+ assertEquals(14.6D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);@@ -237,7 +242,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 4.123456789123456);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(14.623456789123456, (Double) result, 0.000000001);+ assertEquals(14.623456789123455D, (Double) result, 0.000000001);values.clear();values.put("a", 123456789123456789L);@@ -245,7 +250,8 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("c", 123456789123456789L);values.put("d", 123456789123456789L);result = evaluator.evaluate(new Tuple(values));- assertEquals(6 * 123456789123456789D, result);+ assertTrue(result instanceof Double);+ assertEquals(6 * 123456789123456784D, (Double) result, 0);values.clear();values.put("a", 4.12345678);@@ -254,7 +260,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 4.12345678);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(6 * 4.12345678, result);+ assertEquals(6 * 4.12345678D, (Double) result, 0.000000001);}@Test@@ -268,7 +274,8 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("c", 3);values.put("d", 4);result = evaluator.evaluate(new Tuple(values));- assertEquals(10D, result);+ assertTrue(result instanceof Double);+ assertEquals(10D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);@@ -277,7 +284,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 4);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(2.2D, result);+ assertEquals(2.2D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);@@ -286,7 +293,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 4.1);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(2.2D, result);+ assertEquals(2.2D, (Double) result, 0.000000001);values.clear();values.put("a", 1.1);@@ -295,7 +302,7 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", 5.223456789123456);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(3.323456789123456, result);+ assertEquals(3.323456789123456D, (Double) result, 0.000000001);values.clear();values.put("a", 123456789123456789L);@@ -303,7 +310,8 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("c", 123456789123456789L);values.put("d", 123456789123456789L);result = evaluator.evaluate(new Tuple(values));- assertEquals(4 * 123456789123456789D, result);+ assertTrue(result instanceof Double);+ assertEquals(4 * 123456789123456784D, (Double) result, 0);values.clear();values.put("a", -4.12345678);@@ -312,6 +320,6 @@ public class AddEvaluatorTest extends SolrTestCase {values.put("d", -4.12345678);result = evaluator.evaluate(new Tuple(values));assertTrue(result instanceof Double);- assertEquals(6 * -4.12345678, result);+ assertEquals(6 * -4.12345678D, (Double) result, 0.000000001);}}