Tests - fix incorrect test assumption that zero-doc buckets will be returned by the adjacency matrix aggregation. Closes #29159 (#29167)

markharwood · markharwood · commit 5e96c5604179 · 2018-03-21T12:08:46.000Z
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
@@ -82,8 +82,10 @@ protected void assertReduced(InternalAdjacencyMatrix reduced, List<InternalAdjac
         final Map<String, Long> 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<String, Long> actualCounts = new TreeMap<>();

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,10 @@ protected void assertReduced(InternalAdjacencyMatrix reduced, List<InternalAdjac`
`82`	`82`	`final Map<String, Long> expectedCounts = new TreeMap<>();`
`83`	`83`	`for (InternalAdjacencyMatrix input : inputs) {`
`84`	`84`	`for (InternalAdjacencyMatrix.InternalBucket bucket : input.getBuckets()) {`
`85`		`- expectedCounts.compute(bucket.getKeyAsString(),`
	`85`	`+ if (bucket.getDocCount() > 0) {`
	`86`	`+ expectedCounts.compute(bucket.getKeyAsString(),`
`86`	`87`	`(key, oldValue) -> (oldValue == null ? 0 : oldValue) + bucket.getDocCount());`
	`88`	`+ }`
`87`	`89`	`}`
`88`	`90`	`}`
`89`	`91`	`final Map<String, Long> actualCounts = new TreeMap<>();`