Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Update type assumptions in TestMaxScoreQueryParser (#106)

Jason Gerlowski9ca0d5dc4539
diff --git a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
index 3f99fa64158..82ed69c65a6 100644
--- a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
@@ -17,18 +17,28 @@
package org.apache.solr.search;
import org.apache.lucene.index.Term;
-import org.apache.solr.legacy.LegacyNumericRangeQuery;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.BoostQuery;
+import org.apache.lucene.search.DisjunctionMaxQuery;
+import org.apache.lucene.search.IndexOrDocValuesQuery;
+import org.apache.lucene.search.PointRangeQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TermQuery;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.legacy.LegacyNumericRangeQuery;
import org.junit.BeforeClass;
import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
+import java.util.Collection;
import java.util.Collections;
+import java.util.stream.Collectors;
+
+import static org.hamcrest.Matchers.hasItem;
public class TestMaxScoreQueryParser extends SolrTestCaseJ4 {
Query q;
@@ -81,9 +91,12 @@ public class TestMaxScoreQueryParser extends SolrTestCaseJ4 {
assertEquals(1, clauses.length);
assertTrue(clauses[0].getQuery() instanceof DisjunctionMaxQuery);
assertEquals(0.0, ((DisjunctionMaxQuery) clauses[0].getQuery()).getTieBreakerMultiplier(), 1e-15);
- List<Query> qa = ((DisjunctionMaxQuery) clauses[0].getQuery()).getDisjuncts();
+ Collection<Query> qa = ((DisjunctionMaxQuery) clauses[0].getQuery()).getDisjuncts();
assertEquals(2, qa.size());
- assertEquals("text:foo", qa.get(0).toString());
+ final Collection<String> qaStrings = qa.stream()
+ .map(q -> q.toString())
+ .collect(Collectors.toList());
+ org.hamcrest.MatcherAssert.assertThat(qaStrings, hasItem("text:foo"));
}
@Test
@@ -119,9 +132,11 @@ public class TestMaxScoreQueryParser extends SolrTestCaseJ4 {
assertEquals(2, clauses.length);
assertTrue(clauses[0].getQuery() instanceof DisjunctionMaxQuery);
DisjunctionMaxQuery dmq = ((DisjunctionMaxQuery) clauses[0].getQuery());
- Query fooClause = ((BooleanQuery)dmq.getDisjuncts().get(0)).clauses().iterator().next().getQuery();
+ Query fooClause = ((BooleanQuery)dmq.getDisjuncts().stream().filter(q -> q.toString().contains("foo")).findFirst().get())
+ .clauses().iterator().next().getQuery();
assertEquals(5.0, ((BoostQuery) fooClause).getBoost(), 1e-15);
- Query barClause = ((BooleanQuery)dmq.getDisjuncts().get(1)).clauses().iterator().next().getQuery();
+ Query barClause = ((BooleanQuery)dmq.getDisjuncts().stream().filter(q -> q.toString().contains("bar")).findFirst().get())
+ .clauses().iterator().next().getQuery();
assertEquals(6.0, ((BoostQuery) barClause).getBoost(), 1e-15);
assertEquals(7.0, ((BoostQuery) clauses[1].getQuery()).getBoost(), 1e-15);
assertFalse(q instanceof BoostQuery);
@@ -132,9 +147,11 @@ public class TestMaxScoreQueryParser extends SolrTestCaseJ4 {
assertEquals(1, clauses.length);
assertTrue(clauses[0].getQuery() instanceof DisjunctionMaxQuery);
dmq = ((DisjunctionMaxQuery) clauses[0].getQuery());
- fooClause = ((BooleanQuery)dmq.getDisjuncts().get(0)).clauses().iterator().next().getQuery();
+ fooClause = ((BooleanQuery)dmq.getDisjuncts().stream().filter(q -> q.toString().contains("foo")).findFirst().get())
+ .clauses().iterator().next().getQuery();
assertEquals(2.0, ((BoostQuery) fooClause).getBoost(), 1e-15);
- barClause = ((BooleanQuery)dmq.getDisjuncts().get(1)).clauses().iterator().next().getQuery();
+ barClause = ((BooleanQuery)dmq.getDisjuncts().stream().filter(q -> q.toString().contains("bar")).findFirst().get())
+ .clauses().iterator().next().getQuery();
assertFalse(barClause instanceof BoostQuery);
assertEquals(3.0, ((BoostQuery) q).getBoost(), 1e-15);
}