Skip to content

Commit 7d34f9a

Browse files
committed
Fix wilcard query tests after backport
Adapt tests when no type is registered.
1 parent 9f7351f commit 7d34f9a

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

server/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private static WildcardQueryBuilder randomWildcardQuery() {
7171
protected void doAssertLuceneQuery(WildcardQueryBuilder queryBuilder, Query query, SearchContext context) throws IOException {
7272
String expectedFieldName = expectedFieldName(queryBuilder.fieldName());
7373

74-
if (expectedFieldName.equals(STRING_FIELD_NAME)) {
74+
if (expectedFieldName.equals(STRING_FIELD_NAME) && getCurrentTypes().length > 0) {
7575
assertThat(query, instanceOf(WildcardQuery.class));
7676
WildcardQuery wildcardQuery = (WildcardQuery) query;
7777

@@ -98,7 +98,11 @@ public void testEmptyValue() throws IOException {
9898
QueryShardContext context = createShardContext();
9999
context.setAllowUnmappedFields(true);
100100
WildcardQueryBuilder wildcardQueryBuilder = new WildcardQueryBuilder(STRING_FIELD_NAME, "");
101-
assertEquals(wildcardQueryBuilder.toQuery(context).getClass(), WildcardQuery.class);
101+
if (getCurrentTypes().length > 0) {
102+
assertEquals(wildcardQueryBuilder.toQuery(context).getClass(), WildcardQuery.class);
103+
} else {
104+
assertEquals(wildcardQueryBuilder.toQuery(context).getClass(), MatchNoDocsQuery.class);
105+
}
102106
}
103107

104108
public void testFromJson() throws IOException {

0 commit comments

Comments
 (0)