Skip to content

Commit 53f6d94

Browse files
committed
Fix ids query test when none or ALL type is used
See #24460
1 parent d2416a3 commit 53f6d94

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.lucene.search.Query;
2626
import org.elasticsearch.cluster.metadata.MetaData;
2727
import org.elasticsearch.common.ParsingException;
28+
import org.elasticsearch.index.mapper.UidFieldMapper;
2829
import org.elasticsearch.search.internal.SearchContext;
2930
import org.elasticsearch.test.AbstractQueryTestCase;
3031

@@ -73,7 +74,8 @@ protected IdsQueryBuilder doCreateTestQueryBuilder() {
7374

7475
@Override
7576
protected void doAssertLuceneQuery(IdsQueryBuilder queryBuilder, Query query, SearchContext context) throws IOException {
76-
if (queryBuilder.ids().size() == 0) {
77+
if (queryBuilder.ids().size() == 0 || queryBuilder.types().length == 0 ||
78+
(queryBuilder.types().length == 1 && queryBuilder.types()[0].equals(MetaData.ALL))) {
7779
assertThat(query, instanceOf(MatchNoDocsQuery.class));
7880
} else {
7981
assertThat(query, instanceOf(TermInSetQuery.class));

0 commit comments

Comments
 (0)