Fix AutoDateHistogramAggregatorTests failures (#55947)

elastic · Apr 29, 2020 · f3870e6 · f3870e6
1 parent fd554d9
commit f3870e6
Showing 1 changed file with 6 additions and 23 deletions.
diff --git a/.../elasticsearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorTests.java b/.../elasticsearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorTests.java
@@ -220,20 +220,12 @@ public void testAggregateWrongField() throws IOException {
         fieldType.setHasDocValues(true);
         fieldType.setName("date_field");
 
-        testCase(
-            aggregation,
-            DEFAULT_QUERY,
+        testCase(aggregation, DEFAULT_QUERY,
             iw -> {},
             (Consumer<InternalAutoDateHistogram>) histogram -> {
-                // TODO: searchAndReduce incorrectly returns null for empty aggs
-                assertNull(histogram);
-                /*
                 assertEquals(0, histogram.getBuckets().size());
                 assertFalse(AggregationInspectionHelper.hasValue(histogram));
-                 */
-            },
-            fieldType
-        );
+            }, fieldType);
     }
 
     public void testUnmappedMissing() throws IOException {
@@ -245,23 +237,14 @@ public void testUnmappedMissing() throws IOException {
         fieldType.setHasDocValues(true);
         fieldType.setName("date_field");
 
-        testCase(
-            aggregation,
-            DEFAULT_QUERY,
+        testCase(aggregation, DEFAULT_QUERY,
             iw -> {},
             (Consumer<InternalAutoDateHistogram>) histogram -> {
-                // TODO: searchAndReduce incorrectly returns null for empty aggs
-                assertNull(histogram);
-                /*
-                assertEquals(1, histogram.getBuckets().size());
-                assertTrue(AggregationInspectionHelper.hasValue(histogram));
-                 */
-            },
-           fieldType
-        );
+                assertEquals(0, histogram.getBuckets().size());
+                assertFalse(AggregationInspectionHelper.hasValue(histogram));
+        }, fieldType);
     }
 
-
     public void testIntervalYear() throws IOException {
         final long start = LocalDate.of(2015, 1, 1).atStartOfDay(ZoneOffset.UTC).toInstant().toEpochMilli();
         final long end = LocalDate.of(2017, 12, 31).atStartOfDay(ZoneOffset.UTC).toInstant().toEpochMilli();