adapted to changes upstream

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

@@ -130,7 +130,7 @@ public abstract class BaseQueryTestCase<QB extends AbstractQueryBuilder<QB>> ext
     @BeforeClass
     public static void init() throws IOException {
         // we have to prefer CURRENT since with the range of versions we support it's rather unlikely to get the current actually.
-        Version version = randomBoolean() ? Version.CURRENT : VersionUtils.randomVersionBetween(random(), Version.V_1_0_0, Version.CURRENT);
+        Version version = randomBoolean() ? Version.CURRENT : VersionUtils.randomVersionBetween(random(), Version.V_2_0_0_beta1, Version.CURRENT);
         Settings settings = Settings.settingsBuilder()
                 .put("name", BaseQueryTestCase.class.toString())
                 .put("path.home", createTempDir())

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

@@ -21,10 +21,11 @@ package org.elasticsearch.index.query;
 
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
 import org.apache.lucene.search.Query;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.common.compress.CompressedXContent;
-import org.elasticsearch.common.xcontent.*;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.fielddata.IndexFieldDataService;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.query.support.QueryInnerHits;
@@ -37,7 +38,7 @@ import org.elasticsearch.test.TestSearchContext;
 import java.io.IOException;
 
 import static org.elasticsearch.test.StreamsUtils.copyToStringFromClasspath;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.instanceOf;
 
 public class HasChildQueryBuilderTests extends BaseQueryTestCase<HasChildQueryBuilder> {
     protected static final String PARENT_TYPE = "parent";
@@ -115,20 +116,12 @@ public class HasChildQueryBuilderTests extends BaseQueryTestCase<HasChildQueryBu
         QueryBuilder innerQueryBuilder = queryBuilder.query();
         if (innerQueryBuilder instanceof EmptyQueryBuilder) {
             assertNull(query);
-        } else if (context.indexVersionCreated().onOrAfter(Version.V_2_0_0_beta1)) {
+        } else {
             assertThat(query, instanceOf(HasChildQueryBuilder.LateParsingQuery.class));
             HasChildQueryBuilder.LateParsingQuery lpq = (HasChildQueryBuilder.LateParsingQuery) query;
             assertEquals(queryBuilder.minChildren(), lpq.getMinChildren());
             assertEquals(queryBuilder.maxChildren(), lpq.getMaxChildren());
             assertEquals(HasChildQueryBuilder.scoreTypeToScoreMode(queryBuilder.scoreType()), lpq.getScoreMode()); // WTF is this why do we have two?
-        } else {
-            //TODO
-            /*assertThat(query, instanceOf(ChildrenQuery.class));
-            ChildrenQuery lpq = (ChildrenQuery) query;
-            assertEquals(queryBuilder.minChildren(), lpq.getMinChildren());
-            assertEquals(queryBuilder.maxChildren(), lpq.getMaxChildren());
-            assertEquals(queryBuilder.scoreType(), lpq.getScoreType());
-            assertEquals(queryBuilder.shortCircuitCutoff(), lpq.getShortCircuitParentDocSet());*/
         }
         if (queryBuilder.innerHit() != null) {
             assertNotNull(SearchContext.current());

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

@@ -22,7 +22,6 @@ package org.elasticsearch.index.query;
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.join.ScoreMode;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.common.ParseFieldMatcher;
 import org.elasticsearch.common.compress.CompressedXContent;
@@ -114,21 +113,10 @@ public class HasParentQueryBuilderTests extends BaseQueryTestCase<HasParentQuery
         QueryBuilder innerQueryBuilder = queryBuilder.query();
         if (innerQueryBuilder instanceof EmptyQueryBuilder) {
             assertNull(query);
-        } else if (context.indexVersionCreated().onOrAfter(Version.V_2_0_0_beta1)) {
+        } else {
             assertThat(query, instanceOf(HasChildQueryBuilder.LateParsingQuery.class));
             HasChildQueryBuilder.LateParsingQuery lpq = (HasChildQueryBuilder.LateParsingQuery) query;
             assertEquals(queryBuilder.score() ? ScoreMode.Max : ScoreMode.None, lpq.getScoreMode());
-        } else {
-            //TODO
-            /*if (queryBuilder.score()) {
-                assertThat(query, instanceOf(ParentQuery.class));
-                ParentQuery pq = (ParentQuery) query;
-                assertEquals(queryBuilder.boost(), pq.getBoost(), 0f);
-            } else {
-                assertThat(query, instanceOf(ParentConstantScoreQuery.class));
-                ParentConstantScoreQuery csq = (ParentConstantScoreQuery) query;
-                assertEquals(queryBuilder.boost(), csq.getBoost(), 0f);
-            }*/
         }
         if (queryBuilder.innerHit() != null) {
             assertNotNull(SearchContext.current());