improved tests

Author: tteofili

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/ChickenScoreFunctionIT.java

@@ -37,11 +37,14 @@ public void testSimpleWhereMatch() {
         try (var resp = run(query)) {
             assertColumnNames(resp.columns(), List.of("id", "_score"));
             assertColumnTypes(resp.columns(), List.of("integer", "double"));
-            assertValues(resp.values(), List.of(List.of(1, 1.4274532794952393), List.of(6, 1.1248724460601807)));
+            assertValues(resp.values(), List.of(
+                List.of(1, 1.4274532794952393),
+                List.of(6, 1.1248724460601807))
+            );
         }
     }
 
-    public void testSimpleChickenScoreWithWhereMatch() {
+    public void testSimpleChickenScoreWhereMatch() {
         var query = """
             FROM test METADATA _score
             | EVAL first_score = chicken_score(match(content, "brown"))
@@ -55,14 +58,18 @@ public void testSimpleChickenScoreWithWhereMatch() {
             assertColumnTypes(resp.columns(), List.of("integer", "double", "double"));
             assertValues(
                 resp.values(),
-                List.of(List.of(1, 1.156558871269226, 0.2708943784236908), List.of(6, 0.9114001989364624, 0.21347221732139587))
+                List.of(
+                    List.of(1, 1.156558871269226, 0.2708943784236908),
+                    List.of(6, 0.9114001989364624, 0.21347221732139587))
             );
         }
     }
 
-    public void testSimpleChickenScoreAlone() {
+    public void testChickenScorePlusWhereMatch() {
         var query = """
             FROM test METADATA _score
+            | WHERE match(content, "brown")
+            | WHERE match(content, "fox")
             | EVAL first_score = chicken_score(match(content, "brown"))
             | KEEP id, _score, first_score
             | SORT id
@@ -71,25 +78,17 @@ public void testSimpleChickenScoreAlone() {
         try (var resp = run(query)) {
             assertColumnNames(resp.columns(), List.of("id", "_score", "first_score"));
             assertColumnTypes(resp.columns(), List.of("integer", "double", "double"));
-            assertValues(
-                resp.values(),
-                List.of(
-                    List.of(1, 0.0, 0.2708943784236908),
-                    List.of(2, 0.0, 0.2708943784236908),
-                    List.of(3, 0.0, 0.2708943784236908),
-                    List.of(4, 0.0, 0.19301524758338928),
-                    List.of(5, 0.0, 0.0),
-                    List.of(6, 0.0, 0.21347221732139587)
-                )
+            assertValues(resp.values(), List.of(
+                List.of(1, 1.4274532794952393, 0.2708943784236908),
+                List.of(6, 1.1248724460601807, 0.21347221732139587))
             );
         }
     }
 
-    public void testSimpleMatchScoreCopy() {
+    public void testSimpleChickenScoreAlone() {
         var query = """
             FROM test METADATA _score
-            | WHERE match(content, "fox")
-            | EVAL first_score = _score
+            | EVAL first_score = chicken_score(match(content, "brown"))
             | KEEP id, _score, first_score
             | SORT id
             """;
@@ -99,7 +98,14 @@ public void testSimpleMatchScoreCopy() {
             assertColumnTypes(resp.columns(), List.of("integer", "double", "double"));
             assertValues(
                 resp.values(),
-                List.of(List.of(1, 1.156558871269226, 1.156558871269226), List.of(6, 0.9114001989364624, 0.9114001989364624))
+                List.of(
+                    List.of(1, 0.0, 0.2708943784236908),
+                    List.of(2, 0.0, 0.2708943784236908),
+                    List.of(3, 0.0, 0.2708943784236908),
+                    List.of(4, 0.0, 0.19301524758338928),
+                    List.of(5, 0.0, 0.0),
+                    List.of(6, 0.0, 0.21347221732139587)
+                )
             );
         }
     }
@@ -116,7 +122,9 @@ public void testSimpleEvalScoreWithWhereMatch() {
         try (var resp = run(query)) {
             assertColumnNames(resp.columns(), List.of("id", "_score", "first_score"));
             assertColumnTypes(resp.columns(), List.of("integer", "double", "boolean"));
-            assertValues(resp.values(), List.of(List.of(1, 1.156558871269226, true), List.of(6, 0.9114001989364624, true)));
+            assertValues(resp.values(), List.of(
+                List.of(1, 1.156558871269226, true),
+                List.of(6, 0.9114001989364624, true)));
         }
     }