Minor changes to mappings setup, using constant for fieldname that is of date type

Author: cbuescher

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

@@ -23,6 +23,7 @@
 
 import org.apache.lucene.search.Query;
 import org.elasticsearch.Version;
+import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.compress.CompressedString;
@@ -62,13 +63,12 @@
 
 import java.io.IOException;
 
-import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath;
-
 import static org.hamcrest.Matchers.*;
 
 @Ignore
 public abstract class BaseQueryTestCase<QB extends QueryBuilder & Streamable> extends ElasticsearchTestCase {
 
+    protected static final String DATE_FIELD_NAME = "age";
     private static Injector injector;
     private static IndexQueryParserService queryParserService;
     private static Index index;
@@ -110,8 +110,8 @@ protected void configure() {
         ).createInjector();
         queryParserService = injector.getInstance(IndexQueryParserService.class);
         MapperService mapperService = queryParserService.mapperService;
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/query/mapping.json");
-        mapperService.merge("person", new CompressedString(mapping), true);
+        CompressedString mapping = new CompressedString(PutMappingRequest.buildFromSimplifiedDef("type", DATE_FIELD_NAME, "type=date").string());
+        mapperService.merge("type", mapping, true);
     }
 
     @AfterClass

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

@@ -57,7 +57,7 @@ protected RangeQueryBuilder createTestQueryBuilder() {
                 query.to(randomDouble());
             }
         } else {
-            query = new RangeQueryBuilder("born");
+            query = new RangeQueryBuilder(DATE_FIELD_NAME);
             query.from(new DateTime(System.currentTimeMillis() - randomIntBetween(0, 1000000)).toString());
             query.to(new DateTime(System.currentTimeMillis() + randomIntBetween(0, 1000000)).toString());
             if (randomBoolean()) {
@@ -87,7 +87,7 @@ protected RangeQueryBuilder createTestQueryBuilder() {
     @Override
     protected void assertLuceneQuery(RangeQueryBuilder queryBuilder, Query query, QueryParseContext context) throws IOException {
         assertThat(query.getBoost(), is(queryBuilder.boost()));
-        if (!queryBuilder.fieldname().equals("born")) {
+        if (!queryBuilder.fieldname().equals(DATE_FIELD_NAME)) {
             assertThat(query, instanceOf(TermRangeQuery.class));
             TermRangeQuery termRangeQuery = (TermRangeQuery) query;
             assertThat(termRangeQuery.includesLower(), is(queryBuilder.includeLower()));
@@ -102,7 +102,7 @@ protected void assertLuceneQuery(RangeQueryBuilder queryBuilder, Query query, Qu
             String expectedLowerBracket = queryBuilder.includeLower() ? "[" : "{";
             String expectedUpperBracket = queryBuilder.includeUpper() ? "]" : "}";
             String queryString = query.rewrite(null).toString();
-            assertThat(queryString, is("born:"+expectedLowerBracket+expectedFromDate+" TO "+expectedToDate+expectedUpperBracket));
+            assertThat(queryString, is(DATE_FIELD_NAME+":"+expectedLowerBracket+expectedFromDate+" TO "+expectedToDate+expectedUpperBracket));
         }
         if (queryBuilder.queryName() != null) {
             Query namedQuery = context.copyNamedFilters().get(queryBuilder.queryName());