test fixes

Author: smalyshev

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

@@ -81,7 +81,7 @@ public void testBasicEsql() throws IOException {
         Map<String, Object> result = runEsql(builder);
 
         Map<String, String> colA = Map.of("name", "avg(value)", "type", "double");
-        assertResultMap(result, colA, List.of(List.of(499.5d)));
+        assertResultMap(result, List.of(colA), List.of(List.of(499.5d)));
         assertTrue(result.containsKey("took"));
     }
 
@@ -116,7 +116,7 @@ public void testDoNotLogWithInfo() throws IOException {
             RequestObjectBuilder builder = requestObjectBuilder().query("ROW DO_NOT_LOG_ME = 1");
             Map<String, Object> result = runEsql(builder);
             Map<String, String> colA = Map.of("name", "DO_NOT_LOG_ME", "type", "integer");
-            assertResultMap(result, colA, List.of(List.of(1)));
+            assertResultMap(result, List.of(colA), List.of(List.of(1)));
             for (int i = 0; i < cluster.getNumNodes(); i++) {
                 try (InputStream log = cluster.getNodeLog(i, LogType.SERVER)) {
                     Streams.readAllLines(log, line -> assertThat(line, not(containsString("DO_NOT_LOG_ME"))));
@@ -133,7 +133,7 @@ public void testDoLogWithDebug() throws IOException {
             RequestObjectBuilder builder = requestObjectBuilder().query("ROW DO_LOG_ME = 1");
             Map<String, Object> result = runEsql(builder);
             Map<String, String> colA = Map.of("name", "DO_LOG_ME", "type", "integer");
-            assertResultMap(result, colA, List.of(List.of(1)));
+            assertResultMap(result, List.of(colA), List.of(List.of(1)));
             boolean[] found = new boolean[] { false };
             for (int i = 0; i < cluster.getNumNodes(); i++) {
                 try (InputStream log = cluster.getNodeLog(i, LogType.SERVER)) {