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/05/03 17:48:48 UTC
[10/36] lucene-solr:branch_6x: SOLR-10303: Removing the unused class
DatePartEvaluator from the test
SOLR-10303: Removing the unused class DatePartEvaluator from the test
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c2bcc92e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c2bcc92e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c2bcc92e
Branch: refs/heads/branch_6x
Commit: c2bcc92e59b56e1fa720515833b28390b3d0a251
Parents: 7adb9c9
Author: Gethin James <ge...@alfresco.com>
Authored: Wed Apr 12 18:00:35 2017 +0200
Committer: Joel Bernstein <jb...@apache.org>
Committed: Wed May 3 12:47:52 2017 -0400
----------------------------------------------------------------------
.../io/stream/eval/TemporalEvaluatorsTest.java | 26 +++-----------------
1 file changed, 3 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c2bcc92e/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 6f8c788..d44d8c2 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
@@ -38,7 +38,6 @@ import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorEpoch;
import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorHour;
import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorMinute;
import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorMonth;
-import org.apache.solr.client.solrj.io.eval.DatePartEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorQuarter;
import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorSecond;
@@ -69,7 +68,6 @@ public class TemporalEvaluatorsTest {
factory = new StreamFactory();
- factory.withFunctionName("nope", DatePartEvaluator.class);
factory.withFunctionName(TemporalEvaluatorYear.FUNCTION_NAME, TemporalEvaluatorYear.class);
factory.withFunctionName(TemporalEvaluatorMonth.FUNCTION_NAME, TemporalEvaluatorMonth.class);
factory.withFunctionName(TemporalEvaluatorDay.FUNCTION_NAME, TemporalEvaluatorDay.class);
@@ -91,15 +89,6 @@ public class TemporalEvaluatorsTest {
StreamEvaluator evaluator;
try {
- evaluator = factory.constructEvaluator("nope(a)");
- evaluator.evaluate(new Tuple(null));
- assertTrue(false);
- } catch (IOException e) {
- assertTrue(e.getCause().getCause().getMessage().contains("Invalid date expression nope"));
- assertTrue(e.getCause().getCause().getMessage().contains("expecting one of [year, month, day"));
- }
-
- try {
evaluator = factory.constructEvaluator("week()");
assertTrue(false);
} catch (IOException e) {
@@ -191,15 +180,6 @@ public class TemporalEvaluatorsTest {
testFunction("epoch(a)", new Date(1489746645500l).toInstant().toString(), 1489746645500l);
testFunction("epoch(a)", new Date(820454399990l).toInstant().toString(), 820454399990l);
- //Additionally test all functions to make sure they return a non-null number
- for (DatePartEvaluator.FUNCTION function : DatePartEvaluator.FUNCTION.values()) {
- StreamEvaluator evaluator = factory.constructEvaluator(function+"(a)");
- values.clear();
- values.put("a", "2017-03-17T10:30:45Z");
- Object result = evaluator.evaluate(new Tuple(values));
- assertNotNull(function+" should return a result",result);
- assertTrue(function+" should return a number", result instanceof Number);
- }
}
@Test
@@ -297,13 +277,13 @@ public class TemporalEvaluatorsTest {
@Test
public void testExplain() throws IOException {
StreamExpression express = StreamExpressionParser.parse("month('myfield')");
- DatePartEvaluator datePartEvaluator = new DatePartEvaluator(express,factory);
+ TemporalEvaluatorMonth datePartEvaluator = new TemporalEvaluatorMonth(express,factory);
Explanation explain = datePartEvaluator.toExplanation(factory);
assertEquals("month(myfield)", explain.getExpression());
express = StreamExpressionParser.parse("day(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbb)");
- datePartEvaluator = new DatePartEvaluator(express,factory);
- explain = datePartEvaluator.toExplanation(factory);
+ TemporalEvaluatorDay dayPartEvaluator = new TemporalEvaluatorDay(express,factory);
+ explain = dayPartEvaluator.toExplanation(factory);
assertEquals("day(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbb)", explain.getExpression());
}
}