From 93ff973afc0ecfaa8a4d587046c8642953f77bb0 Mon Sep 17 00:00:00 2001 From: markharwood Date: Wed, 21 Mar 2018 10:42:14 +0000 Subject: [PATCH] Tests - fix incorrect test assumption that zero-doc buckets will be returned by the adjacency matrix aggregation. Closes #29159 (#29167) --- .../bucket/adjacency/InternalAdjacencyMatrixTests.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java index 742e769ed40..2ba97251b31 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java @@ -82,8 +82,10 @@ public class InternalAdjacencyMatrixTests extends InternalMultiBucketAggregation final Map expectedCounts = new TreeMap<>(); for (InternalAdjacencyMatrix input : inputs) { for (InternalAdjacencyMatrix.InternalBucket bucket : input.getBuckets()) { - expectedCounts.compute(bucket.getKeyAsString(), + if (bucket.getDocCount() > 0) { + expectedCounts.compute(bucket.getKeyAsString(), (key, oldValue) -> (oldValue == null ? 0 : oldValue) + bucket.getDocCount()); + } } } final Map actualCounts = new TreeMap<>();