From fae0666226c1d8046998d41c61616574eb09730f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Fri, 8 Apr 2016 16:40:04 +0200 Subject: [PATCH] Remove norelease comments in test classes This doesn't seem to block release, and the comments should rather be tasks that be left in the code base. --- .../search/aggregations/metrics/FiltersTests.java | 6 ------ .../search/builder/SearchSourceBuilderTests.java | 10 +--------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java index 40038444b00..2ea9de6acab 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java @@ -36,9 +36,6 @@ public class FiltersTests extends BaseAggregationTestCase[] filters = new QueryBuilder[size]; for (int i = 0; i < size; i++) { - // NORELEASE make RandomQueryBuilder work outside of the - // AbstractQueryTestCase - // builder.query(RandomQueryBuilder.createQuery(getRandom())); filters[i] = QueryBuilders.termQuery(randomAsciiOfLengthBetween(5, 20), randomAsciiOfLengthBetween(5, 20)); } factory = new FiltersAggregatorBuilder(randomAsciiOfLengthBetween(1, 20), filters); diff --git a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java index 6c5a6aa5b45..ae231f92520 100644 --- a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java @@ -53,6 +53,7 @@ import org.elasticsearch.index.query.EmptyQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.index.query.support.InnerHitBuilderTests; +import org.elasticsearch.index.query.support.InnerHitsBuilder; import org.elasticsearch.indices.IndicesModule; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; @@ -69,7 +70,6 @@ import org.elasticsearch.script.ScriptSettings; import org.elasticsearch.search.SearchModule; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.AggregatorParsers; -import org.elasticsearch.index.query.support.InnerHitsBuilder; import org.elasticsearch.search.fetch.source.FetchSourceContext; import org.elasticsearch.search.highlight.HighlightBuilderTests; import org.elasticsearch.search.rescore.QueryRescoreBuilderTests; @@ -321,15 +321,9 @@ public class SearchSourceBuilderTests extends ESTestCase { } } if (randomBoolean()) { - // NORELEASE make RandomQueryBuilder work outside of the - // AbstractQueryTestCase - // builder.query(RandomQueryBuilder.createQuery(getRandom())); builder.query(QueryBuilders.termQuery(randomAsciiOfLengthBetween(5, 20), randomAsciiOfLengthBetween(5, 20))); } if (randomBoolean()) { - // NORELEASE make RandomQueryBuilder work outside of the - // AbstractQueryTestCase - // builder.postFilter(RandomQueryBuilder.createQuery(getRandom())); builder.postFilter(QueryBuilders.termQuery(randomAsciiOfLengthBetween(5, 20), randomAsciiOfLengthBetween(5, 20))); } if (randomBoolean()) { @@ -431,11 +425,9 @@ public class SearchSourceBuilderTests extends ESTestCase { } } if (randomBoolean()) { - // NORELEASE need a random aggregation builder method builder.aggregation(AggregationBuilders.avg(randomAsciiOfLengthBetween(5, 20))); } if (randomBoolean()) { - // NORELEASE need a method to randomly build content for ext XContentBuilder xContentBuilder = XContentFactory.jsonBuilder(); xContentBuilder.startObject(); xContentBuilder.field("term_vectors_fetch", randomAsciiOfLengthBetween(5, 20));