Split the yaml to test for basic and trial, cleanedup and acted on all the comments

Author: mridula-s109

x-pack/plugin/search-business-rules/src/test/java/org/elasticsearch/xpack/searchbusinessrules/retriever/PinnedRetrieverBuilderTests.java

@@ -199,7 +199,10 @@ public void testValidateSort() {
         assertThat(
             e.getMessage(),
             equalTo(
-                "[" + PinnedRetrieverBuilder.NAME + "] retriever only supports sorting by score, invalid sort criterion: {\n  \"field1\" : {\n    \"order\" : \"asc\"\n  }\n}"
+                "["
+                    + PinnedRetrieverBuilder.NAME
+                    + "] retriever only supports sorting by score, "
+                    + "invalid sort criterion: {\n  \"field1\" : {\n    \"order\" : \"asc\"\n  }\n}"
             )
         );
 
@@ -211,7 +214,10 @@ public void testValidateSort() {
         assertThat(
             e.getMessage(),
             equalTo(
-                "[" + PinnedRetrieverBuilder.NAME + "] retriever only supports sorting by score, invalid sort criterion: {\n  \"field1\" : {\n    \"order\" : \"asc\"\n  }\n}"
+                "["
+                    + PinnedRetrieverBuilder.NAME
+                    + "] retriever only supports sorting by score, "
+                    + "invalid sort criterion: {\n  \"field1\" : {\n    \"order\" : \"asc\"\n  }\n}"
             )
         );
     }

x-pack/plugin/search-business-rules/src/yamlRestTest/java/org/elasticsearch/xpack/searchbusinessrules/SearchBusinessRulesClientYamlTestSuiteIT.java

@@ -19,7 +19,7 @@ public class SearchBusinessRulesClientYamlTestSuiteIT extends ESClientYamlSuiteT
     @ClassRule
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
-        .setting("xpack.license.self_generated.type", "trial")
+        .setting("xpack.license.self_generated.type", "basic")
         .setting("xpack.security.enabled", "false")
         .build();
 
@@ -29,7 +29,7 @@ public SearchBusinessRulesClientYamlTestSuiteIT(final ClientYamlTestCandidate te
 
     @ParametersFactory
     public static Iterable<Object[]> parameters() throws Exception {
-        return ESClientYamlSuiteTestCase.createParameters();
+        return ESClientYamlSuiteTestCase.createParameters(new String[] { "search-business-rules/10_pinned_retriever_basic" });
     }
 
     @Override

x-pack/plugin/search-business-rules/src/yamlRestTest/java/org/elasticsearch/xpack/searchbusinessrules/SearchBusinessRulesRrfClientYamlTestSuiteIT.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+package org.elasticsearch.xpack.searchbusinessrules;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.elasticsearch.test.cluster.ElasticsearchCluster;
+import org.elasticsearch.test.cluster.local.distribution.DistributionType;
+import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
+import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
+import org.junit.ClassRule;
+
+/**
+ * Test suite for running YAML tests specific to Pinned Retriever + RRF combination,
+ * requiring a trial license.
+ */
+public class SearchBusinessRulesRrfClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
+
+    @ClassRule
+    public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
+        .distribution(DistributionType.DEFAULT)
+        // RRF requires trial or platinum license
+        .setting("xpack.license.self_generated.type", "trial")
+        .setting("xpack.security.enabled", "false")
+        .build();
+
+    public SearchBusinessRulesRrfClientYamlTestSuiteIT(final ClientYamlTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws Exception {
+        return ESClientYamlSuiteTestCase.createParameters(new String[] { "search-business-rules/11_pinned_retriever_rrf" });
+    }
+
+    @Override
+    protected String getTestRestCluster() {
+        return cluster.getHttpAddresses();
+    }
+}

x-pack/plugin/search-business-rules/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/10_pinned_retriever.yml renamed to x-pack/plugin/search-business-rules/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/10_pinned_retriever_basic.yml

@@ -144,47 +144,6 @@ setup:
   - match: { hits.hits.3._id: doc4 }
   - match: { hits.hits.4._id: doc5 }
 
----
-"pinned retriever combined with rrf":
-  - skip:
-      features: headers
-
-  - do:
-      headers:
-        Content-Type: application/json
-      search:
-        index: test-index1
-        body:
-          retriever:
-            pinned:
-              ids: ["doc1"]
-              retriever:
-                rrf:
-                  retrievers: [
-                    {
-                      standard: {
-                        query: {
-                          term: { text: "document" }
-                        }
-                      }
-                    },
-                    {
-                      standard: {
-                        query: {
-                          term: { text: "three" }
-                        }
-                      }
-                    }
-                  ]
-              rank_window_size: 10
-
-  - match: { hits.total.value: 5 }
-  - match: { hits.hits.0._id: doc1 }
-  - match: { hits.hits.0._score: 1.7014122E38 }
-  - match: { hits.hits.1._id: doc3 }
-  - match: { hits.hits.1._score < 100.0 }
-  - match: { hits.hits.2._id: doc2 }
-
 ---
 "pinned retriever with pagination":
   - skip: { features: headers }
@@ -208,33 +167,6 @@ setup:
   - match: { hits.hits.0._id: doc2 }
   - match: { hits.hits.0._score: 1.7014122E38 }
 
----
-"pinned retriever as a sub-retriever":
-  - skip: { features: headers }
-  - do:
-      headers: { Content-Type: application/json }
-      search:
-        index: test-index1
-        body:
-          retriever:
-            rrf:
-              retrievers:
-                -
-                  standard:
-                    query:
-                      match: { text: "document" }
-                -
-                  pinned:
-                    ids: ["doc1", "doc2"]
-                    retriever:
-                      standard:
-                        query:
-                          match: { text: "document" }
-
-  - match: { hits.total.value: 5 }
-  - match: { hits.hits.0._id: doc1 }
-  - lt: { hits.hits.0._score: 100.0 }
-
 ---
 "pinned retriever with explicit sort on score":
   - skip: { features: headers }

x-pack/plugin/search-business-rules/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/11_pinned_retriever_rrf.yml

@@ -0,0 +1,94 @@
+setup:
+  - do:
+      indices.create:
+        index: test-index1
+
+  - do:
+      bulk:
+        refresh: true
+        index: test-index1
+        body:
+          - index:
+              _id: doc1
+          - { "text": "document one" }
+          - index:
+              _id: doc2
+          - { "text": "document two" }
+          - index:
+              _id: doc3
+          - { "text": "document three" }
+          - index:
+              _id: doc4
+          - { "text": "document four" }
+          - index:
+              _id: doc5
+          - { "text": "document five" }
+
+---
+"pinned retriever combined with rrf":
+  - skip:
+      features: headers
+
+  - do:
+      headers:
+        Content-Type: application/json
+      search:
+        index: test-index1
+        body:
+          retriever:
+            pinned:
+              ids: ["doc1"]
+              retriever:
+                rrf:
+                  retrievers: [
+                    {
+                      standard: {
+                        query: {
+                          term: { text: "document" }
+                        }
+                      }
+                    },
+                    {
+                      standard: {
+                        query: {
+                          term: { text: "three" }
+                        }
+                      }
+                    }
+                  ]
+              rank_window_size: 10
+
+  - match: { hits.total.value: 5 }
+  - match: { hits.hits.0._id: doc1 }
+  - match: { hits.hits.0._score: 1.7014122E38 }
+  - match: { hits.hits.1._id: doc3 }
+  - match: { hits.hits.1._score < 100.0 }
+  - match: { hits.hits.2._id: doc2 }
+
+---
+"pinned retriever as a sub-retriever":
+  - skip: { features: headers }
+  - do:
+      headers: { Content-Type: application/json }
+      search:
+        index: test-index1
+        body:
+          retriever:
+            rrf:
+              retrievers:
+                -
+                  standard:
+                    query:
+                      match: { text: "document" }
+                -
+                  pinned:
+                    ids: ["doc1", "doc2"]
+                    retriever:
+                      standard:
+                        query:
+                          match: { text: "document" }
+
+  - match: { hits.total.value: 5 }
+  - match: { hits.hits.0._id: doc1 }
+  - lt: { hits.hits.0._score: 100.0 }
+