Skip to content

Commit ab4292a

Browse files
Correct tests
1 parent cc2370c commit ab4292a

File tree

1 file changed

+25
-6
lines changed

1 file changed

+25
-6
lines changed

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldTypeTests.java

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.apache.lucene.queries.intervals.IntervalsSource;
1515
import org.apache.lucene.search.ConstantScoreQuery;
1616
import org.apache.lucene.search.FuzzyQuery;
17+
import org.apache.lucene.search.IndexSearcher;
1718
import org.apache.lucene.search.MatchAllDocsQuery;
1819
import org.apache.lucene.search.MultiPhraseQuery;
1920
import org.apache.lucene.search.PhraseQuery;
@@ -152,30 +153,48 @@ public void testPhrasePrefixQuery() throws IOException {
152153
assertNotEquals(new MatchAllDocsQuery(), SourceConfirmedTextQuery.approximate(delegate));
153154
}
154155

155-
public void testTermIntervals() throws IOException {
156+
public void testTermIntervals() {
156157
MappedFieldType ft = new MatchOnlyTextFieldType("field");
157158
IntervalsSource termIntervals = ft.termIntervals(new BytesRef("foo"), MOCK_CONTEXT);
158159
assertThat(termIntervals, Matchers.instanceOf(SourceIntervalsSource.class));
159160
assertEquals(Intervals.term(new BytesRef("foo")), ((SourceIntervalsSource) termIntervals).getIntervalsSource());
160161
}
161162

162-
public void testPrefixIntervals() throws IOException {
163+
public void testPrefixIntervals() {
163164
MappedFieldType ft = new MatchOnlyTextFieldType("field");
164165
IntervalsSource prefixIntervals = ft.prefixIntervals(new BytesRef("foo"), MOCK_CONTEXT);
165166
assertThat(prefixIntervals, Matchers.instanceOf(SourceIntervalsSource.class));
166-
assertEquals(Intervals.prefix(new BytesRef("foo")), ((SourceIntervalsSource) prefixIntervals).getIntervalsSource());
167+
assertEquals(Intervals.prefix(new BytesRef("foo"), IndexSearcher.getMaxClauseCount()),
168+
((SourceIntervalsSource) prefixIntervals).getIntervalsSource());
167169
}
168170

169-
public void testWildcardIntervals() throws IOException {
171+
public void testWildcardIntervals() {
170172
MappedFieldType ft = new MatchOnlyTextFieldType("field");
171173
IntervalsSource wildcardIntervals = ft.wildcardIntervals(new BytesRef("foo"), MOCK_CONTEXT);
172174
assertThat(wildcardIntervals, Matchers.instanceOf(SourceIntervalsSource.class));
173-
assertEquals(Intervals.wildcard(new BytesRef("foo")), ((SourceIntervalsSource) wildcardIntervals).getIntervalsSource());
175+
assertEquals(Intervals.wildcard(new BytesRef("foo"), IndexSearcher.getMaxClauseCount()),
176+
((SourceIntervalsSource) wildcardIntervals).getIntervalsSource());
174177
}
175178

176-
public void testFuzzyIntervals() throws IOException {
179+
public void testRegexpIntervals() {
180+
MappedFieldType ft = new MatchOnlyTextFieldType("field");
181+
IntervalsSource regexpIntervals = ft.regexpIntervals(new BytesRef("foo"), MOCK_CONTEXT);
182+
assertThat(regexpIntervals, Matchers.instanceOf(SourceIntervalsSource.class));
183+
assertEquals(Intervals.regexp(new BytesRef("foo"), IndexSearcher.getMaxClauseCount()),
184+
((SourceIntervalsSource) regexpIntervals).getIntervalsSource());
185+
}
186+
187+
public void testFuzzyIntervals() {
177188
MappedFieldType ft = new MatchOnlyTextFieldType("field");
178189
IntervalsSource fuzzyIntervals = ft.fuzzyIntervals("foo", 1, 2, true, MOCK_CONTEXT);
179190
assertThat(fuzzyIntervals, Matchers.instanceOf(SourceIntervalsSource.class));
180191
}
192+
193+
public void testRangeIntervals() {
194+
MappedFieldType ft = new MatchOnlyTextFieldType("field");
195+
IntervalsSource rangeIntervals = ft.rangeIntervals(new BytesRef("foo"), new BytesRef("foo1"), true, true, MOCK_CONTEXT);
196+
assertThat(rangeIntervals, Matchers.instanceOf(SourceIntervalsSource.class));
197+
assertEquals(Intervals.range(new BytesRef("foo"), new BytesRef("foo1"), true, true, IndexSearcher.getMaxClauseCount()),
198+
((SourceIntervalsSource) rangeIntervals).getIntervalsSource());
199+
}
181200
}

0 commit comments

Comments
 (0)