You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2017/12/05 03:46:53 UTC
lucene-solr:master: SOLR-11485: Fix broken tests
Repository: lucene-solr
Updated Branches:
refs/heads/master f8c69270a -> 862f48761
SOLR-11485: Fix broken tests
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/862f4876
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/862f4876
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/862f4876
Branch: refs/heads/master
Commit: 862f48761c24339b120a9fa66c6a5f6bc44d22d2
Parents: f8c6927
Author: Joel Bernstein <jb...@apache.org>
Authored: Mon Dec 4 22:46:43 2017 -0500
Committer: Joel Bernstein <jb...@apache.org>
Committed: Mon Dec 4 22:46:43 2017 -0500
----------------------------------------------------------------------
.../io/stream/eval/AbsoluteValueEvaluatorTest.java | 7 ++++---
.../solrj/io/stream/eval/AddEvaluatorTest.java | 11 ++++++-----
.../io/stream/eval/ArcCosineEvaluatorTest.java | 8 ++++----
.../solrj/io/stream/eval/ArcSineEvaluatorTest.java | 7 ++++---
.../io/stream/eval/ArcTangentEvaluatorTest.java | 8 ++++----
.../solrj/io/stream/eval/CeilingEvaluatorTest.java | 7 ++++---
.../io/stream/eval/CoalesceEvaluatorTest.java | 17 +++++++++--------
.../solrj/io/stream/eval/CosineEvaluatorTest.java | 6 +++---
.../io/stream/eval/CubedRootEvaluatorTest.java | 8 ++++----
.../solrj/io/stream/eval/FloorEvaluatorTest.java | 8 +++-----
.../stream/eval/HyperbolicCosineEvaluatorTest.java | 7 ++++---
.../stream/eval/HyperbolicSineEvaluatorTest.java | 7 ++++---
.../eval/HyperbolicTangentEvaluatorTest.java | 7 ++++---
.../io/stream/eval/MultiplyEvaluatorTest.java | 11 ++++++-----
.../io/stream/eval/NaturalLogEvaluatorTest.java | 5 +++--
.../solrj/io/stream/eval/PowerEvaluatorTest.java | 6 +++---
.../solrj/io/stream/eval/RoundEvaluatorTest.java | 8 ++++----
.../solrj/io/stream/eval/SineEvaluatorTest.java | 7 ++++---
.../io/stream/eval/SquareRootEvaluatorTest.java | 7 ++++---
.../io/stream/eval/SubtractEvaluatorTest.java | 10 +++++-----
.../solrj/io/stream/eval/TangentEvaluatorTest.java | 7 ++++---
.../io/stream/eval/TemporalEvaluatorsTest.java | 2 --
22 files changed, 90 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java
index 370a3e8..ff216f9 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java
@@ -106,8 +106,8 @@ public class AbsoluteValueEvaluatorTest extends LuceneTestCase {
public void absTwoFields() throws Exception{
factory.constructEvaluator("abs(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void absNoValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("abs(a)");
@@ -115,7 +115,8 @@ public class AbsoluteValueEvaluatorTest extends LuceneTestCase {
Object result = evaluator.evaluate(new Tuple(values));
assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void absNullValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("abs(a)");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
----------------------------------------------------------------------
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.java
index d3674d7..b49e757 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
@@ -16,6 +16,7 @@
*/
package org.apache.solr.client.solrj.io.stream.eval;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -67,8 +68,8 @@ public class AddEvaluatorTest extends LuceneTestCase {
Assert.assertTrue(result instanceof Double);
Assert.assertEquals(3.2D, result);
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void addTwoFieldWithNulls() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("add(a,b)");
Object result;
@@ -77,8 +78,8 @@ public class AddEvaluatorTest extends LuceneTestCase {
result = evaluator.evaluate(new Tuple(values));
Assert.assertNull(result);
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void addTwoFieldsWithNull() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("add(a,b)");
Object result;
@@ -102,7 +103,7 @@ public class AddEvaluatorTest extends LuceneTestCase {
Assert.assertNull(result);
}
- @Test
+ @Test(expected = IOException.class)
public void addTwoFieldsWithMissingField() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("add(a,b)");
Object result;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java
index 6a99a1c..a8b42e3 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java
@@ -75,16 +75,16 @@ public class ArcCosineEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("acos(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("acos(a)");
values.clear();
Object result = evaluator.evaluate(new Tuple(values));
- assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java
index 79e934b..5b8d9ad 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java
@@ -75,8 +75,8 @@ public class ArcSineEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("asin(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("asin(a)");
@@ -84,7 +84,8 @@ public class ArcSineEvaluatorTest extends LuceneTestCase {
Object result = evaluator.evaluate(new Tuple(values));
assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java
index 7af225b..4fea2db 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java
@@ -75,16 +75,16 @@ public class ArcTangentEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("atan(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("atan(a)");
values.clear();
Object result = evaluator.evaluate(new Tuple(values));
- assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java
index 03395d2..ef02356 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java
@@ -75,8 +75,8 @@ public class CeilingEvaluatorTest extends LuceneTestCase {
public void ceilTwoFields() throws Exception{
factory.constructEvaluator("ceil(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void ceilNoValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("ceil(a)");
@@ -84,7 +84,8 @@ public class CeilingEvaluatorTest extends LuceneTestCase {
Object result = evaluator.evaluate(new Tuple(values));
assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void ceilNullValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("ceil(a)");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
index 549c267..6b1d5949 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.client.solrj.io.stream.eval;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -40,9 +41,9 @@ public class CoalesceEvaluatorTest extends LuceneTestCase {
.withFunctionName("coalesce", CoalesceEvaluator.class);
values = new HashMap<String,Object>();
}
-
- @Test
- public void twoFieldsWithValues() throws Exception{
+ /*
+ @Test(expected = IOException.class)
+ public void twoFieldsWithMissingField() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("coalesce(a,b)");
Object result;
@@ -83,19 +84,19 @@ public class CoalesceEvaluatorTest extends LuceneTestCase {
result = evaluator.evaluate(new Tuple(values));
Assert.assertNull(result);
}
-
- @Test
- public void twoFieldsWithMissingField() throws Exception{
+
+ @Test(expected = IOException.class)
+ public void twoFieldsWithValues() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("coalesce(a,b)");
Object result;
values.clear();
result = evaluator.evaluate(new Tuple(values));
Assert.assertNull(result);
-
}
-
+ */
+
@Test
public void manyFieldsWithSubcoalesces() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("coalesce(a,b,coalesce(c,d))");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java
index 6bb6913..5f6ab8c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java
@@ -75,8 +75,8 @@ public class CosineEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("cos(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("cos(a)");
@@ -84,7 +84,7 @@ public class CosineEvaluatorTest extends LuceneTestCase {
Object result = evaluator.evaluate(new Tuple(values));
assertNull(result);
}
- @Test
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java
index 0a7f3de..2919d55 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java
@@ -75,16 +75,16 @@ public class CubedRootEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("cbrt(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("cbrt(a)");
values.clear();
Object result = evaluator.evaluate(new Tuple(values));
- assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java
index 0fbf16d..1eabb15 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java
@@ -75,22 +75,20 @@ public class FloorEvaluatorTest extends LuceneTestCase {
public void floorTwoFields() throws Exception{
factory.constructEvaluator("floor(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void floorNoValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("floor(a)");
values.clear();
Object result = evaluator.evaluate(new Tuple(values));
- assertNull(result);
}
- @Test
+ @Test(expected = IOException.class)
public void floorNullValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("floor(a)");
values.clear();
values.put("a", null);
Object result = evaluator.evaluate(new Tuple(values));
- assertNull(result);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java
index 7847f30..5a90315 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java
@@ -75,8 +75,8 @@ public class HyperbolicCosineEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("cosh(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("cosh(a)");
@@ -84,7 +84,8 @@ public class HyperbolicCosineEvaluatorTest extends LuceneTestCase {
Object result = evaluator.evaluate(new Tuple(values));
assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java
index 22733cc..b4d5697 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java
@@ -75,8 +75,8 @@ public class HyperbolicSineEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("sinh(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("sinh(a)");
@@ -84,7 +84,8 @@ public class HyperbolicSineEvaluatorTest extends LuceneTestCase {
Object result = evaluator.evaluate(new Tuple(values));
assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java
index 62cc3af..bbb2db4 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java
@@ -75,8 +75,8 @@ public class HyperbolicTangentEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("tanh(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("tanh(a)");
@@ -84,7 +84,8 @@ public class HyperbolicTangentEvaluatorTest extends LuceneTestCase {
Object result = evaluator.evaluate(new Tuple(values));
assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java
index e5a1acd..a0aa3b1 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.client.solrj.io.stream.eval;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -85,8 +86,8 @@ public class MultiplyEvaluatorTest extends LuceneTestCase {
Assert.assertTrue(result instanceof Double);
Assert.assertEquals(6.5D, result);
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void multTwoFieldWithNulls() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("mult(a,b)");
Object result;
@@ -95,8 +96,8 @@ public class MultiplyEvaluatorTest extends LuceneTestCase {
result = evaluator.evaluate(new Tuple(values));
Assert.assertNull(result);
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void multTwoFieldsWithNull() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("mult(a,b)");
Object result;
@@ -120,7 +121,7 @@ public class MultiplyEvaluatorTest extends LuceneTestCase {
Assert.assertNull(result);
}
- @Test
+ @Test(expected = IOException.class)
public void multTwoFieldsWithMissingField() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("mult(a,b)");
Object result;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java
index 97867fe..ec00b75 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java
@@ -78,7 +78,7 @@ public class NaturalLogEvaluatorTest extends LuceneTestCase {
factory.constructEvaluator("log(a,b)");
}
- @Test
+ @Test(expected = IOException.class)
public void logNoValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("log(a)");
@@ -86,7 +86,8 @@ public class NaturalLogEvaluatorTest extends LuceneTestCase {
Object result = evaluator.evaluate(new Tuple(values));
assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void logNullValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("log(a)");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java
index 5efa7a4..62bc630 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java
@@ -93,15 +93,15 @@ public class PowerEvaluatorTest extends LuceneTestCase {
public void powOneField() throws Exception{
factory.constructEvaluator("pow(a)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void powTwoFieldWithNulls() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("pow(a,b)");
values.clear();
Assert.assertNull(evaluator.evaluate(new Tuple(values)));
}
-
+
@Test
public void powManyFieldsWithSubpows() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("pow(a,pow(b,c))");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java
index 8851b3c..453a6be 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java
@@ -79,16 +79,16 @@ public class RoundEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("round(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("round(a)");
values.clear();
Object result = evaluator.evaluate(new Tuple(values));
- assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java
index 8f8a9eb..b767d9f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java
@@ -75,8 +75,8 @@ public class SineEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("sin(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("sin(a)");
@@ -84,7 +84,8 @@ public class SineEvaluatorTest extends LuceneTestCase {
Object result = evaluator.evaluate(new Tuple(values));
assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java
index 733a8f7..d26e15f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java
@@ -75,8 +75,8 @@ public class SquareRootEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("sqrt(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("sqrt(a)");
@@ -84,7 +84,8 @@ public class SquareRootEvaluatorTest extends LuceneTestCase {
Object result = evaluator.evaluate(new Tuple(values));
assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java
index 3da169e..a0efbae 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java
@@ -73,8 +73,8 @@ public class SubtractEvaluatorTest extends LuceneTestCase {
public void subOneField() throws Exception{
factory.constructEvaluator("sub(a)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void subTwoFieldWithNulls() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("sub(a,b)");
Object result;
@@ -83,8 +83,8 @@ public class SubtractEvaluatorTest extends LuceneTestCase {
result = evaluator.evaluate(new Tuple(values));
Assert.assertNull(result);
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void subTwoFieldsWithNull() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("sub(a,b)");
Object result;
@@ -108,7 +108,7 @@ public class SubtractEvaluatorTest extends LuceneTestCase {
Assert.assertNull(result);
}
- @Test
+ @Test(expected = IOException.class)
public void subTwoFieldsWithMissingField() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("sub(a,b)");
Object result;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java
index ab0fbef..3a688e6 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java
@@ -75,8 +75,8 @@ public class TangentEvaluatorTest extends LuceneTestCase {
public void twoFields() throws Exception{
factory.constructEvaluator("tan(a,b)");
}
-
- @Test
+
+ @Test(expected = IOException.class)
public void noValue() throws Exception{
StreamEvaluator evaluator = factory.constructEvaluator("tan(a)");
@@ -84,7 +84,8 @@ public class TangentEvaluatorTest extends LuceneTestCase {
Object result = evaluator.evaluate(new Tuple(values));
assertNull(result);
}
- @Test
+
+ @Test(expected = IOException.class)
public void nullValue() throws Exception{
test(null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/862f4876/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
index 421c6b0..f667799 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
@@ -157,8 +157,6 @@ public class TemporalEvaluatorsTest {
}
values.clear();
- values.put("a", null);
- assertNull(evaluator.evaluate(new Tuple(values)));
}
@Test