diff options
author | Tanguy Leroux <tlrx.dev@gmail.com> | 2017-05-19 12:46:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-19 12:46:37 +0200 |
commit | 4c34ea8fc84ccd27af98b81f51408fcb53077a20 (patch) | |
tree | 1abde5e455a948831bdd918e9e50f234dc219de5 /core/src/test/java/org | |
parent | dd731d9e9890a11fd3884c8a126a1323df651a8e (diff) |
Remove //norelease and cleans up somet aggregations tests (#24789)
Diffstat (limited to 'core/src/test/java/org')
9 files changed, 4 insertions, 20 deletions
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java index 58c3cc8a22..a278f64473 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java @@ -24,7 +24,6 @@ import org.elasticsearch.search.aggregations.InternalAggregations; import org.elasticsearch.search.aggregations.InternalMultiBucketAggregationTestCase; import org.elasticsearch.search.aggregations.ParsedMultiBucketAggregation; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; -import org.junit.Before; import java.util.ArrayList; import java.util.List; @@ -36,7 +35,6 @@ public class InternalAdjacencyMatrixTests extends InternalMultiBucketAggregation private List<String> keys; @Override - @Before public void setUp() throws Exception { super.setUp(); keys = new ArrayList<>(); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFiltersTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFiltersTests.java index 03b5cb13d9..ec1b71419e 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFiltersTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFiltersTests.java @@ -24,7 +24,6 @@ import org.elasticsearch.search.aggregations.InternalAggregations; import org.elasticsearch.search.aggregations.InternalMultiBucketAggregationTestCase; import org.elasticsearch.search.aggregations.ParsedMultiBucketAggregation; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; -import org.junit.Before; import java.util.ArrayList; import java.util.List; @@ -37,7 +36,6 @@ public class InternalFiltersTests extends InternalMultiBucketAggregationTestCase private List<String> keys; @Override - @Before public void setUp() throws Exception { super.setUp(); keyed = randomBoolean(); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java index 38cdb00317..0482ab936b 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java @@ -26,7 +26,6 @@ import org.elasticsearch.search.aggregations.InternalMultiBucketAggregationTestC import org.elasticsearch.search.aggregations.ParsedMultiBucketAggregation; import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; -import org.junit.Before; import java.util.List; import java.util.Map; @@ -37,7 +36,6 @@ public abstract class InternalRangeTestCase<T extends InternalAggregation & Rang private boolean keyed; @Override - @Before public void setUp() throws Exception { super.setUp(); keyed = randomBoolean(); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java index 5427d6c5d2..7e21757229 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java @@ -26,7 +26,6 @@ import org.elasticsearch.search.aggregations.InternalAggregations; import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation; import org.elasticsearch.search.aggregations.ParsedMultiBucketAggregation; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; -import org.junit.Before; import java.util.ArrayList; import java.util.Collections; @@ -39,7 +38,6 @@ public class InternalRangeTests extends InternalRangeTestCase<InternalRange> { private List<Tuple<Double, Double>> ranges; @Override - @Before public void setUp() throws Exception { super.setUp(); format = randomNumericDocValueFormat(); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRangeTests.java index f8cb8b3a1d..3ba8fad417 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRangeTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRangeTests.java @@ -29,7 +29,6 @@ import org.elasticsearch.search.aggregations.bucket.range.InternalRangeTestCase; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; -import org.junit.Before; import java.util.ArrayList; import java.util.Collections; @@ -43,7 +42,6 @@ public class InternalDateRangeTests extends InternalRangeTestCase<InternalDateRa private List<Tuple<Double, Double>> dateRanges; @Override - @Before public void setUp() throws Exception { super.setUp(); format = randomNumericDocValueFormat(); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistanceTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistanceTests.java index e726530f79..0adc5d028e 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistanceTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistanceTests.java @@ -26,7 +26,6 @@ import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation; import org.elasticsearch.search.aggregations.ParsedMultiBucketAggregation; import org.elasticsearch.search.aggregations.bucket.range.InternalRangeTestCase; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; -import org.junit.Before; import java.util.ArrayList; import java.util.Collections; @@ -38,7 +37,6 @@ public class InternalGeoDistanceTests extends InternalRangeTestCase<InternalGeoD private List<Tuple<Double, Double>> geoDistanceRanges; @Override - @Before public void setUp() throws Exception { super.setUp(); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java index 5b0e715c8a..793c6aec5c 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java @@ -29,7 +29,6 @@ import org.elasticsearch.search.aggregations.bucket.significant.heuristics.JLHSc import org.elasticsearch.search.aggregations.bucket.significant.heuristics.MutualInformation; import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristic; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; -import org.junit.Before; import java.util.ArrayList; import java.util.HashSet; @@ -43,7 +42,6 @@ public class SignificantLongTermsTests extends InternalSignificantTermsTestCase private DocValueFormat format; @Override - @Before public void setUp() throws Exception { super.setUp(); significanceHeuristic = randomSignificanceHeuristic(); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java index 07fe4c1ae8..762472e4be 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java @@ -30,7 +30,6 @@ import org.elasticsearch.search.aggregations.bucket.significant.heuristics.JLHSc import org.elasticsearch.search.aggregations.bucket.significant.heuristics.MutualInformation; import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristic; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; -import org.junit.Before; import java.util.ArrayList; import java.util.HashSet; @@ -43,7 +42,6 @@ public class SignificantStringTermsTests extends InternalSignificantTermsTestCas private SignificanceHeuristic significanceHeuristic; @Override - @Before public void setUp() throws Exception { super.setUp(); significanceHeuristic = randomSignificanceHeuristic(); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java index 8e90b88176..921a458b5e 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java @@ -27,16 +27,16 @@ import org.elasticsearch.search.aggregations.metrics.stats.extended.InternalExte import org.elasticsearch.search.aggregations.metrics.stats.extended.ParsedExtendedStats; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; import org.elasticsearch.test.InternalAggregationTestCase; -import org.junit.Before; import java.util.List; import java.util.Map; public class InternalExtendedStatsTests extends InternalAggregationTestCase<InternalExtendedStats> { - protected double sigma; - @Before - public void randomSigma() { + private double sigma; + + @Override + public void setUp() throws Exception { this.sigma = randomDoubleBetween(0, 10, true); } |