Fix failing test in EsqlSecurityIT

elastic · Sep 11, 2024 · 7ca990c · 7ca990c
1 parent 28c1c5c
commit 7ca990c
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/...n/esql/qa/security/src/javaRestTest/java/org/elasticsearch/xpack/esql/EsqlSecurityIT.java b/...n/esql/qa/security/src/javaRestTest/java/org/elasticsearch/xpack/esql/EsqlSecurityIT.java
@@ -150,8 +150,11 @@ public void testAllowedIndices() throws Exception {
             Response resp = runESQLCommand(user, "from index-user1 | stats sum=sum(value)");
             assertOK(resp);
             Map<String, Object> responseMap = entityAsMap(resp);
-            MapMatcher matcher = responseMatcher().entry("took", ((Integer) responseMap.get("took")).intValue())
-                .entry("columns", List.of(Map.of("name", "sum", "type", "double")))
+            MapMatcher mapMatcher = responseMatcher();
+            if (responseMap.get("took") != null) {
+                mapMatcher = mapMatcher.entry("took", ((Integer)responseMap.get("took")).intValue());
+            }
+            MapMatcher matcher = mapMatcher.entry("columns", List.of(Map.of("name", "sum", "type", "double")))
                 .entry("values", List.of(List.of(43.0d)));
             assertMap(responseMap, matcher);
         }
@@ -160,8 +163,11 @@ public void testAllowedIndices() throws Exception {
             Response resp = runESQLCommand(user, "from index-user2 | stats sum=sum(value)");
             assertOK(resp);
             Map<String, Object> responseMap = entityAsMap(resp);
-            MapMatcher matcher = responseMatcher().entry("took", ((Integer) responseMap.get("took")).intValue())
-                .entry("columns", List.of(Map.of("name", "sum", "type", "double")))
+            MapMatcher mapMatcher = responseMatcher();
+            if (responseMap.get("took") != null) {
+                mapMatcher = mapMatcher.entry("took", ((Integer)responseMap.get("took")).intValue());
+            }
+            MapMatcher matcher = mapMatcher.entry("columns", List.of(Map.of("name", "sum", "type", "double")))
                 .entry("values", List.of(List.of(72.0d)));
             assertMap(responseMap, matcher);
         }
@@ -170,8 +176,11 @@ public void testAllowedIndices() throws Exception {
             Response resp = runESQLCommand("metadata1_read2", "from " + index + " | stats sum=sum(value)");
             assertOK(resp);
             Map<String, Object> responseMap = entityAsMap(resp);
-            MapMatcher matcher = responseMatcher().entry("took", ((Integer) responseMap.get("took")).intValue())
-                .entry("columns", List.of(Map.of("name", "sum", "type", "double")))
+            MapMatcher mapMatcher = responseMatcher();
+            if (responseMap.get("took") != null) {
+                mapMatcher = mapMatcher.entry("took", ((Integer)responseMap.get("took")).intValue());
+            }
+            MapMatcher matcher = mapMatcher.entry("columns", List.of(Map.of("name", "sum", "type", "double")))
                 .entry("values", List.of(List.of(72.0d)));
             assertMap(responseMap, matcher);
         }