Fix ids query test when none or ALL type is used

See #24460
elastic · May 9, 2017 · 53f6d94 · 53f6d94 · jpountz · May 10, 2017
1 parent d2416a3
commit 53f6d94
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java
@@ -25,6 +25,7 @@
 import org.apache.lucene.search.Query;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.common.ParsingException;
+import org.elasticsearch.index.mapper.UidFieldMapper;
 import org.elasticsearch.search.internal.SearchContext;
 import org.elasticsearch.test.AbstractQueryTestCase;
 
@@ -73,7 +74,8 @@ protected IdsQueryBuilder doCreateTestQueryBuilder() {
 
     @Override
     protected void doAssertLuceneQuery(IdsQueryBuilder queryBuilder, Query query, SearchContext context) throws IOException {
-        if (queryBuilder.ids().size() == 0) {
+        if (queryBuilder.ids().size() == 0 || queryBuilder.types().length == 0 ||
+            (queryBuilder.types().length == 1 && queryBuilder.types()[0].equals(MetaData.ALL))) {
             assertThat(query, instanceOf(MatchNoDocsQuery.class));
         } else {
             assertThat(query, instanceOf(TermInSetQuery.class));