add new tests

Signed-off-by: Anthony Leong <[email protected]>

Author: ajleong623

client/rest-high-level/src/test/java/org/opensearch/client/SearchIT.java

@@ -84,6 +84,9 @@
 import org.opensearch.search.aggregations.bucket.composite.CompositeAggregation;
 import org.opensearch.search.aggregations.bucket.composite.CompositeValuesSourceBuilder;
 import org.opensearch.search.aggregations.bucket.composite.TermsValuesSourceBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramInterval;
+import org.opensearch.search.aggregations.bucket.histogram.ParsedDateHistogram;
 import org.opensearch.search.aggregations.bucket.range.Range;
 import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.terms.MultiTermsAggregationBuilder;
@@ -237,6 +240,32 @@ public void indexDocuments() throws IOException {
             client().performRequest(createFilteredAlias);
         }
 
+        {
+            Request create = new Request(HttpPut.METHOD_NAME, "/index5");
+            create.setJsonEntity(
+                "{"
+                    + "  \"mappings\": {"
+                    + "    \"properties\": {"
+                    + "      \"date_created\": {"
+                    + "        \"type\":  \"date\""
+                    + "      },"
+                    + "      \"distribution\": {"
+                    + "        \"properties\": {"
+                    + "          \"number_events\": {"
+                    + "            \"type\":  \"unsigned_long\""
+                    + "          }"
+                    + "        }"
+                    + "      }"
+                    + "    }"
+                    + "  }"
+                    + "}"
+            );
+            client().performRequest(create);
+            Request doc1 = new Request(HttpPut.METHOD_NAME, "/index5/_doc/1");
+            doc1.setJsonEntity("{\"date_created\":\"2024\", \"distribution\":{\"number_events\": 1000000}}");
+            client().performRequest(doc1);
+        }
+
         client().performRequest(new Request(HttpPost.METHOD_NAME, "/_refresh"));
     }
 
@@ -514,6 +543,38 @@ public void testSearchWithTermsAndRangeAgg() throws IOException {
         }
     }
 
+    public void testSearchWithDateAndRangeAgg() throws IOException {
+        SearchRequest searchRequest = new SearchRequest("index5");
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        DateHistogramAggregationBuilder yearAgg = new DateHistogramAggregationBuilder("year").field("date_created")
+            .calendarInterval(DateHistogramInterval.YEAR)
+            .format("yyyy");
+
+        RangeAggregationBuilder rangeAgg = new RangeAggregationBuilder("number_events").field("distribution.number_events")
+            .addRange("0--999", 0.0, 1000.0)
+            .addRange("999--", 1000.0, 10_000_000_000_00L);
+        searchSourceBuilder.aggregation(yearAgg).aggregation(rangeAgg);
+        searchSourceBuilder.size(0);
+        searchRequest.source(searchSourceBuilder);
+        SearchResponse searchResponse = execute(searchRequest, highLevelClient()::search, highLevelClient()::searchAsync);
+        assertSearchHeader(searchResponse);
+        ParsedDateHistogram yearHistogram = searchResponse.getAggregations().get("year");
+        assertEquals(1, yearHistogram.getBuckets().size());
+        assertEquals("2024", yearHistogram.getBuckets().get(0).getKeyAsString());
+        Range rangeAggregation = searchResponse.getAggregations().get("number_events");
+        assertEquals(2, rangeAggregation.getBuckets().size());
+        {
+            Range.Bucket bucket = rangeAggregation.getBuckets().get(0);
+            assertEquals("0--999", bucket.getKeyAsString());
+            assertEquals(0, bucket.getDocCount());
+        }
+        {
+            Range.Bucket bucket = rangeAggregation.getBuckets().get(1);
+            assertEquals("999--", bucket.getKeyAsString());
+            assertEquals(1, bucket.getDocCount());
+        }
+    }
+
     public void testSearchWithTermsAndWeightedAvg() throws IOException {
         SearchRequest searchRequest = new SearchRequest("index");
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml

@@ -738,49 +738,3 @@ setup:
   - match: { hits.total.value: 3 }
   - match: { aggregations.HalloweenAgg.buckets.to-october.doc_count: 3 }
   - match: { aggregations.HalloweenAgg.buckets.from-september.doc_count: 0 }
-
----
-"Date range and range aggregation test":
-  - do:
-      indices.create:
-        index: test_date_range_and_range_agg
-        body:
-          settings:
-            number_of_replicas: 0
-            number_of_shards: 1
-            refresh_interval: -1
-          mappings:
-            properties:
-              date_created:
-                type: date
-              distribution:
-                properties:
-                  number_events:
-                    type: unsigned_long
-  - do:
-      index:
-        index: test_date_range_and_range_agg
-        id: 1
-        body: { "date_created": "2024", "distribution": { "number_events": 1000000}}
-  - do:
-      search:
-        index: test_date_range_and_range_agg
-        body:
-          size: 0
-          aggregations:
-            year:
-              date_histogram:
-                field: date_created
-                interval: "year"
-                format: "yyyy"
-            number_events:
-              range:
-                field: distribution.number_events
-                ranges:
-                  - to: 1000
-                    from: 0
-                    key: "0--999"
-                  - to: 10000000000000
-                    from: 1000
-                    key: "999--"
-          _source: false