Skip to content

Commit bacec0b

Browse files
Correct tests
1 parent 7095cf3 commit bacec0b

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
@@ -13,6 +13,7 @@
1313
import org.apache.lucene.queries.intervals.IntervalsSource;
1414
import org.apache.lucene.search.ConstantScoreQuery;
1515
import org.apache.lucene.search.FuzzyQuery;
16+
import org.apache.lucene.search.IndexSearcher;
1617
import org.apache.lucene.search.MatchAllDocsQuery;
1718
import org.apache.lucene.search.MultiPhraseQuery;
1819
import org.apache.lucene.search.PhraseQuery;
@@ -151,30 +152,48 @@ public void testPhrasePrefixQuery() throws IOException {
151152
assertNotEquals(new MatchAllDocsQuery(), SourceConfirmedTextQuery.approximate(delegate));
152153
}
153154

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

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

168-
public void testWildcardIntervals() throws IOException {
170+
public void testWildcardIntervals() {
169171
MappedFieldType ft = new MatchOnlyTextFieldType("field");
170172
IntervalsSource wildcardIntervals = ft.wildcardIntervals(new BytesRef("foo"), MOCK_CONTEXT);
171173
assertThat(wildcardIntervals, Matchers.instanceOf(SourceIntervalsSource.class));
172-
assertEquals(Intervals.wildcard(new BytesRef("foo")), ((SourceIntervalsSource) wildcardIntervals).getIntervalsSource());
174+
assertEquals(Intervals.wildcard(new BytesRef("foo"), IndexSearcher.getMaxClauseCount()),
175+
((SourceIntervalsSource) wildcardIntervals).getIntervalsSource());
173176
}
174177

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

0 commit comments

Comments
 (0)