Update validation tests

Author: alex-spies

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java

@@ -94,16 +94,41 @@ public void testRemoteEnrichAfterCoordinatorOnlyPlans() {
 
         String err;
 
+
+        // Remote enrich is ok after limit
         plan("""
             FROM test
+            | LIMIT 10
             | EVAL language_code = languages
             | ENRICH _remote:languages ON language_code
             | STATS count(*) BY language_name
             """, analyzer);
 
+        // Remote enrich is ok after topn
+        plan("""
+            FROM test
+            | EVAL language_code = languages
+            | SORT languages
+            | ENRICH _remote:languages ON language_code
+            """, analyzer);
+        plan("""
+            FROM test
+            | EVAL language_code = languages
+            | SORT languages
+            | LIMIT 2
+            | ENRICH _remote:languages ON language_code
+            """, analyzer);
+
+        // Remote enrich is ok before pipeline breakers
         plan("""
             FROM test
+            | EVAL language_code = languages
+            | ENRICH _remote:languages ON language_code
             | LIMIT 10
+            """, analyzer);
+
+        plan("""
+            FROM test
             | EVAL language_code = languages
             | ENRICH _remote:languages ON language_code
             | STATS count(*) BY language_name
@@ -117,6 +142,13 @@ public void testRemoteEnrichAfterCoordinatorOnlyPlans() {
             | LIMIT 10
             """, analyzer);
 
+        plan("""
+            FROM test
+            | EVAL language_code = languages
+            | ENRICH _remote:languages ON language_code
+            | SORT language_name
+            """, analyzer);
+
         err = error("""
             FROM test
             | EVAL language_code = languages
@@ -227,6 +259,9 @@ public void testRemoteEnrichAfterCoordinatorOnlyPlans() {
         assertThat(err, containsString("4:3: ENRICH with remote policy can't be executed after [CHANGE_POINT salary ON languages]@2:3"));
     }
 
+    /**
+     * The validation should not trigger for remote enrich after a lookup join. Lookup joins can be executed anywhere.
+     */
     public void testRemoteEnrichAfterLookupJoin() {
         EnrichResolution enrichResolution = new EnrichResolution();
         loadEnrichPolicyResolution(
@@ -254,32 +289,29 @@ public void testRemoteEnrichAfterLookupJoin() {
             | %s
             """, lookupCommand), analyzer);
 
-        String err = error(Strings.format("""
+        plan(Strings.format("""
             FROM test
             | EVAL language_code = languages
             | %s
             | ENRICH _remote:languages ON language_code
             """, lookupCommand), analyzer);
-        assertThat(err, containsString("4:3: ENRICH with remote policy can't be executed after [" + lookupCommand + "]@3:3"));
 
-        err = error(Strings.format("""
+        plan(Strings.format("""
             FROM test
             | EVAL language_code = languages
             | %s
             | ENRICH _remote:languages ON language_code
             | %s
             """, lookupCommand, lookupCommand), analyzer);
-        assertThat(err, containsString("4:3: ENRICH with remote policy can't be executed after [" + lookupCommand + "]@3:3"));
 
-        err = error(Strings.format("""
+        plan(Strings.format("""
             FROM test
             | EVAL language_code = languages
             | %s
             | EVAL x = 1
             | MV_EXPAND language_code
             | ENRICH _remote:languages ON language_code
             """, lookupCommand), analyzer);
-        assertThat(err, containsString("6:3: ENRICH with remote policy can't be executed after [" + lookupCommand + "]@3:3"));
     }
 
     public void testRemoteLookupJoinWithPipelineBreaker() {