Tets

Author: nik9000

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -2667,6 +2667,8 @@ public static Request newXContentRequest(HttpMethod method, String endpoint, ToX
 
     protected static MapMatcher getResultMatcher(boolean includeMetadata, boolean includePartial) {
         MapMatcher mapMatcher = matchesMap();
+        mapMatcher = mapMatcher.entry("documents_found", greaterThanOrEqualTo(0));
+        mapMatcher = mapMatcher.entry("values_loaded", greaterThanOrEqualTo(0));
         if (includeMetadata) {
             mapMatcher = mapMatcher.entry("took", greaterThanOrEqualTo(0));
         }
@@ -2688,7 +2690,13 @@ protected static MapMatcher getResultMatcher(Map<String, Object> result) {
      * Match result columns and values, with default matchers for metadata.
      */
     protected static void assertResultMap(Map<String, Object> result, Matcher<?> columnMatcher, Matcher<?> valuesMatcher) {
-        assertMap(result, getResultMatcher(result).entry("columns", columnMatcher).entry("values", valuesMatcher));
+        assertMap(
+            result,
+            getResultMatcher(result).entry("columns", columnMatcher)
+                .entry("values", valuesMatcher)
+                .entry("documents_found", greaterThanOrEqualTo(0))
+                .entry("values_loaded", greaterThanOrEqualTo(0))
+        );
     }
 
     protected static void assertResultMap(Map<String, Object> result, Object columnMatcher, Object valuesMatcher) {

x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/RestEsqlIT.java

@@ -659,7 +659,9 @@ private MapMatcher commonProfile() {
             .entry("cpu_nanos", greaterThan(0L))
             .entry("took_nanos", greaterThan(0L))
             .entry("operators", instanceOf(List.class))
-            .entry("sleeps", matchesMap().extraOk());
+            .entry("sleeps", matchesMap().extraOk())
+            .entry("documents_found", greaterThanOrEqualTo(0))
+            .entry("values_loaded", greaterThanOrEqualTo(0));
     }
 
     /**
@@ -688,7 +690,8 @@ private String checkOperatorProfile(Map<String, Object> o) {
                 .entry("rows_emitted", greaterThan(0))
                 .entry("process_nanos", greaterThan(0))
                 .entry("processed_queries", List.of("*:*"));
-            case "ValuesSourceReaderOperator" -> basicProfile().entry("readers_built", matchesMap().extraOk());
+            case "ValuesSourceReaderOperator" -> basicProfile().entry("values_loaded", greaterThanOrEqualTo(0))
+                .entry("readers_built", matchesMap().extraOk());
             case "AggregationOperator" -> matchesMap().entry("pages_processed", greaterThan(0))
                 .entry("rows_received", greaterThan(0))
                 .entry("rows_emitted", greaterThan(0))

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java

@@ -59,6 +59,7 @@
 import static java.util.Map.entry;
 import static org.elasticsearch.common.logging.LoggerMessageFormat.format;
 import static org.elasticsearch.test.ListMatcher.matchesList;
+import static org.elasticsearch.test.MapMatcher.assertMap;
 import static org.elasticsearch.test.MapMatcher.matchesMap;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.as;
 import static org.elasticsearch.xpack.esql.qa.rest.RestEsqlTestCase.Mode.ASYNC;
@@ -266,12 +267,16 @@ public static RequestObjectBuilder jsonBuilder() throws IOException {
 
     public void testGetAnswer() throws IOException {
         Map<String, Object> answer = runEsql(requestObjectBuilder().query("row a = 1, b = 2"));
-        assertEquals(4, answer.size());
+        assertEquals(6, answer.size());
         assertThat(((Integer) answer.get("took")).intValue(), greaterThanOrEqualTo(0));
         Map<String, String> colA = Map.of("name", "a", "type", "integer");
         Map<String, String> colB = Map.of("name", "b", "type", "integer");
-        assertEquals(List.of(colA, colB), answer.get("columns"));
-        assertEquals(List.of(List.of(1, 2)), answer.get("values"));
+        assertMap(answer, matchesMap().entry("took", greaterThanOrEqualTo(0))
+            .entry("is_partial", any(Boolean.class))
+            .entry("documents_found", 0)
+            .entry("values_loaded", 0)
+            .entry("columns", List.of(colA, colB))
+            .entry("values", List.of(List.of(1, 2))));
     }
 
     public void testUseUnknownIndex() throws IOException {