honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix QueryAnalyzerTests. 

Closes #29363
This commit is contained in:
Adrien Grand 2018-04-04 12:47:37 +02:00
parent c052e989cf
commit c21057b3a2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/percolator/src/test/java/org/elasticsearch/percolator/QueryAnalyzerTests.java
View File

@ -384,7 +384,6 @@ public class QueryAnalyzerTests extends ESTestCase {
assertThat(terms.get(1).bytes(), equalTo(phraseQuery.getTerms()[1].bytes())); assertThat(terms.get(1).bytes(), equalTo(phraseQuery.getTerms()[1].bytes()));
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/29363")
public void testExactMatch_booleanQuery() { public void testExactMatch_booleanQuery() {
BooleanQuery.Builder builder = new BooleanQuery.Builder(); BooleanQuery.Builder builder = new BooleanQuery.Builder();
TermQuery termQuery1 = new TermQuery(new Term("_field", "_term1")); TermQuery termQuery1 = new TermQuery(new Term("_field", "_term1"));
@ -419,12 +418,15 @@ public class QueryAnalyzerTests extends ESTestCase {
assertThat(result.minimumShouldMatch, equalTo(1)); assertThat(result.minimumShouldMatch, equalTo(1));
builder = new BooleanQuery.Builder(); builder = new BooleanQuery.Builder();
builder.setMinimumNumberShouldMatch(randomIntBetween(1, 2)); int msm = randomIntBetween(2, 3);
builder.setMinimumNumberShouldMatch(msm);
TermQuery termQuery3 = new TermQuery(new Term("_field", "_term3"));
builder.add(termQuery1, BooleanClause.Occur.SHOULD); builder.add(termQuery1, BooleanClause.Occur.SHOULD);
builder.add(termQuery2, BooleanClause.Occur.SHOULD); builder.add(termQuery2, BooleanClause.Occur.SHOULD);
builder.add(termQuery3, BooleanClause.Occur.SHOULD);
result = analyze(builder.build(), Version.CURRENT); result = analyze(builder.build(), Version.CURRENT);
assertThat("Minimum match has not impact on whether the result is verified", result.verified, is(true)); assertThat("Minimum match has not impact on whether the result is verified", result.verified, is(true));
assertThat("msm is at least two so result.minimumShouldMatch should 2 too", result.minimumShouldMatch, equalTo(2)); assertThat("msm is at least two so result.minimumShouldMatch should 2 too", result.minimumShouldMatch, equalTo(msm));
builder = new BooleanQuery.Builder(); builder = new BooleanQuery.Builder();
builder.add(termQuery1, randomBoolean() ? BooleanClause.Occur.MUST : BooleanClause.Occur.FILTER); builder.add(termQuery1, randomBoolean() ? BooleanClause.Occur.MUST : BooleanClause.Occur.FILTER);
@ -453,7 +455,6 @@ public class QueryAnalyzerTests extends ESTestCase {
assertThat("Prohibited clause, so candidate matches are not verified", result.verified, is(false)); assertThat("Prohibited clause, so candidate matches are not verified", result.verified, is(false));
assertThat(result.minimumShouldMatch, equalTo(1)); assertThat(result.minimumShouldMatch, equalTo(1));
TermQuery termQuery3 = new TermQuery(new Term("_field", "_term3"));
builder = new BooleanQuery.Builder() builder = new BooleanQuery.Builder()
.add(new BooleanQuery.Builder() .add(new BooleanQuery.Builder()
.add(termQuery1, Occur.FILTER) .add(termQuery1, Occur.FILTER)