Add object mapping to base test setup to extend test coverage

Author: cbuescher

src/test/java/org/elasticsearch/index/query/BaseQueryTestCase.java

@@ -77,13 +77,14 @@
 @Ignore
 public abstract class BaseQueryTestCase<QB extends QueryBuilder<QB>> extends ElasticsearchTestCase {
 
+    protected static final String OBJECT_FIELD_NAME = "object";
     protected static final String DATE_FIELD_NAME = "age";
     protected static final String INT_FIELD_NAME = "price";
     protected static final String STRING_FIELD_NAME = "text";
     protected static final String DOUBLE_FIELD_NAME = "double";
     protected static final String BOOLEAN_FIELD_NAME = "boolean";
     protected static final String[] mappedFieldNames = new String[]{DATE_FIELD_NAME, INT_FIELD_NAME,
-        STRING_FIELD_NAME, DOUBLE_FIELD_NAME, BOOLEAN_FIELD_NAME};
+        STRING_FIELD_NAME, DOUBLE_FIELD_NAME, BOOLEAN_FIELD_NAME, OBJECT_FIELD_NAME};
 
     private static Injector injector;
     private static IndexQueryParserService queryParserService;
@@ -140,7 +141,10 @@ protected void configure() {
                     INT_FIELD_NAME, "type=integer",
                     DOUBLE_FIELD_NAME, "type=double",
                     BOOLEAN_FIELD_NAME, "type=boolean",
-                    STRING_FIELD_NAME, "type=string").string()), false);
+                    STRING_FIELD_NAME, "type=string",
+                    OBJECT_FIELD_NAME, "type=object",
+                    OBJECT_FIELD_NAME+"."+DATE_FIELD_NAME, "type=date",
+                    OBJECT_FIELD_NAME+"."+INT_FIELD_NAME, "type=integer").string()), false);
             currentTypes[i] = type;
         }
 

src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTest.java

@@ -44,7 +44,12 @@ protected ExistsQueryBuilder createEmptyQueryBuilder() {
     @Override
     protected Query createExpectedQuery(ExistsQueryBuilder queryBuilder, QueryParseContext context) throws IOException {
         final FieldNamesFieldMapper fieldNamesMapper = (FieldNamesFieldMapper)context.mapperService().fullName(FieldNamesFieldMapper.NAME);
-        Collection<String> fields = context.simpleMatchToIndexNames(queryBuilder.name());
+        String fieldNameInTest = queryBuilder.name();
+        if (getCurrentTypes().length > 0 && fieldNameInTest.equals(BaseQueryTestCase.OBJECT_FIELD_NAME)) {
+            // objects have two inner fields, add wildcard to match behaviour of extending field name pattern in test
+            fieldNameInTest = fieldNameInTest +".*";
+        }
+        Collection<String> fields = context.simpleMatchToIndexNames(fieldNameInTest);
 
         if (fields.isEmpty()) {
             return Queries.newMatchNoDocsQuery();