diff options
author | Luca Cavanna <javanna@users.noreply.github.com> | 2017-05-09 21:08:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-09 21:08:10 +0200 |
commit | c5bdbecc649d1af8ef2d08dbd66d36882802b5a4 (patch) | |
tree | 8b8a917ec8cbf7f3f78c4918cc727cf9ebd352d4 /core/src/test/java/org/elasticsearch/search/aggregations/metrics | |
parent | 1959fd6a1a4e842b2408d522e693463cbbc6312d (diff) |
[TEST] Add test for Aggregations#fromXContent (#24524)
AggregationsTests#testFromXContent verifies that parsing of aggregations works by combining multiple aggs at the same level, and also adding sub-aggregations to multi bucket and single bucket aggs, up to a maximum depth of 5.
Diffstat (limited to 'core/src/test/java/org/elasticsearch/search/aggregations/metrics')
4 files changed, 17 insertions, 15 deletions
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java index 53483be55c..1d3a8b45a1 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java @@ -34,7 +34,7 @@ public class InternalMaxTests extends InternalAggregationTestCase<InternalMax> { @Override protected InternalMax createTestInstance(String name, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) { - double value = frequently() ? randomDouble() : randomFrom(new Double[] { Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY }); + double value = frequently() ? randomDouble() : randomFrom(Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY); DocValueFormat formatter = randomNumericDocValueFormat(); return new InternalMax(name, value, formatter, pipelineAggregators, metaData); } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java index efa5438ae3..60f0179d9a 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java @@ -28,7 +28,6 @@ import org.elasticsearch.search.aggregations.InternalAggregationTestCase; import org.elasticsearch.search.aggregations.ParsedAggregation; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; import org.junit.After; -import org.junit.Before; import java.util.ArrayList; import java.util.List; @@ -38,12 +37,22 @@ public class InternalCardinalityTests extends InternalAggregationTestCase<Intern private static List<HyperLogLogPlusPlus> algos; private static int p; - @Before - public void setup() { + @Override + public void setUp() throws Exception { + super.setUp(); algos = new ArrayList<>(); p = randomIntBetween(HyperLogLogPlusPlus.MIN_PRECISION, HyperLogLogPlusPlus.MAX_PRECISION); } + @After //we force @After to have it run before ESTestCase#after otherwise it fails + @Override + public void tearDown() throws Exception { + super.tearDown(); + Releasables.close(algos); + algos.clear(); + algos = null; + } + @Override protected InternalCardinality createTestInstance(String name, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) { @@ -82,11 +91,4 @@ public class InternalCardinalityTests extends InternalAggregationTestCase<Intern assertEquals(aggregation.getValue(), parsed.getValue(), Double.MIN_VALUE); assertEquals(aggregation.getValueAsString(), parsed.getValueAsString()); } - - @After - public void cleanup() { - Releasables.close(algos); - algos.clear(); - algos = null; - } } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java index 31da19bb91..52474c4ae3 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java @@ -47,7 +47,7 @@ public class InternalGeoCentroidTests extends InternalAggregationTestCase<Intern if (count == 0) { centroid = null; } - return new InternalGeoCentroid("_name", centroid, count, Collections.emptyList(), Collections.emptyMap()); + return new InternalGeoCentroid(name, centroid, count, Collections.emptyList(), Collections.emptyMap()); } @Override diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java index 72167dac65..b3cfbcea6c 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java @@ -23,7 +23,6 @@ import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.InternalAggregationTestCase; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; -import org.junit.Before; import java.io.IOException; import java.util.Arrays; @@ -38,8 +37,9 @@ public abstract class AbstractPercentilesTestCase<T extends InternalAggregation private boolean keyed; private DocValueFormat docValueFormat; - @Before - public void init() { + @Override + public void setUp() throws Exception { + super.setUp(); percents = randomPercents(false); keyed = randomBoolean(); docValueFormat = randomNumericDocValueFormat(); |