Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-10303: Removing the unused class DatePartEvaluator from the test

This commit is contained in:
Gethin James 2017-04-12 18:00:35 +02:00 committed by Joel Bernstein
parent 8642ed9f88
commit b78a270c9d
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
View File

@ -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.TemporalEvaluatorHour;
import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorMinute; 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.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.StreamEvaluator;
import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorQuarter; import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorQuarter;
import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorSecond; import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorSecond;
@ -69,7 +68,6 @@ public class TemporalEvaluatorsTest {
factory = new StreamFactory(); factory = new StreamFactory();
factory.withFunctionName("nope", DatePartEvaluator.class);
factory.withFunctionName(TemporalEvaluatorYear.FUNCTION_NAME, TemporalEvaluatorYear.class); factory.withFunctionName(TemporalEvaluatorYear.FUNCTION_NAME, TemporalEvaluatorYear.class);
factory.withFunctionName(TemporalEvaluatorMonth.FUNCTION_NAME, TemporalEvaluatorMonth.class); factory.withFunctionName(TemporalEvaluatorMonth.FUNCTION_NAME, TemporalEvaluatorMonth.class);
factory.withFunctionName(TemporalEvaluatorDay.FUNCTION_NAME, TemporalEvaluatorDay.class); factory.withFunctionName(TemporalEvaluatorDay.FUNCTION_NAME, TemporalEvaluatorDay.class);
@ -90,15 +88,6 @@ public class TemporalEvaluatorsTest {
StreamEvaluator evaluator; 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 { try {
evaluator = factory.constructEvaluator("week()"); evaluator = factory.constructEvaluator("week()");
assertTrue(false); assertTrue(false);
@ -191,15 +180,6 @@ public class TemporalEvaluatorsTest {
testFunction("epoch(a)", new Date(1489746645500l).toInstant().toString(), 1489746645500l); testFunction("epoch(a)", new Date(1489746645500l).toInstant().toString(), 1489746645500l);
testFunction("epoch(a)", new Date(820454399990l).toInstant().toString(), 820454399990l); 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 @Test
@ -297,13 +277,13 @@ public class TemporalEvaluatorsTest {
@Test @Test
public void testExplain() throws IOException { public void testExplain() throws IOException {
StreamExpression express = StreamExpressionParser.parse("month('myfield')"); StreamExpression express = StreamExpressionParser.parse("month('myfield')");
DatePartEvaluator datePartEvaluator = new DatePartEvaluator(express,factory); TemporalEvaluatorMonth datePartEvaluator = new TemporalEvaluatorMonth(express,factory);
Explanation explain = datePartEvaluator.toExplanation(factory); Explanation explain = datePartEvaluator.toExplanation(factory);
assertEquals("month(myfield)", explain.getExpression()); assertEquals("month(myfield)", explain.getExpression());
express = StreamExpressionParser.parse("day(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbb)"); express = StreamExpressionParser.parse("day(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbb)");
datePartEvaluator = new DatePartEvaluator(express,factory); TemporalEvaluatorDay dayPartEvaluator = new TemporalEvaluatorDay(express,factory);
explain = datePartEvaluator.toExplanation(factory); explain = dayPartEvaluator.toExplanation(factory);
assertEquals("day(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbb)", explain.getExpression()); assertEquals("day(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbb)", explain.getExpression());
} }
} }