Refactored code to clean it up based on PR comments

Author: mridula-s109

x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/EnterpriseSearchModuleTestUtils.java

@@ -99,27 +99,28 @@ public static QueryRule randomQueryRule() {
         return new QueryRule(ruleId, type, criteria, randomQueryRuleActions(), randomQueryRulePriority());
     }
 
-    public static QueryRuleCriteria randomQueryRuleCriteria() {
-        QueryRuleCriteriaType criteriaType = randomFrom(QueryRuleCriteriaType.values());
-        String metadata = randomAlphaOfLengthBetween(3, 10);
+    private static List<Object> generateRandomValues(QueryRuleCriteriaType criteriaType, int numValues) {
+        if (criteriaType == QueryRuleCriteriaType.ALWAYS) {
+            return null;
+        }
+        
         List<Object> values = new ArrayList<>();
-        int numValues = randomIntBetween(1, 3);
-
-        if (List.of(QueryRuleCriteriaType.GT, QueryRuleCriteriaType.GTE, QueryRuleCriteriaType.LT, QueryRuleCriteriaType.LTE)
-            .contains(criteriaType)) {
-            for (int i = 0; i < numValues; i++) {
-                BigDecimal value = BigDecimal.valueOf(randomDoubleBetween(0, 1000, true)).setScale(2, RoundingMode.HALF_UP);
-                values.add(value.toString());
-            }
-        } else if (criteriaType == QueryRuleCriteriaType.ALWAYS) {
-            metadata = null;
-            values = null;
-        } else {
-            for (int i = 0; i < numValues; i++) {
-                values.add(randomAlphaOfLengthBetween(3, 10));
-            }
+        for (int i = 0; i < numValues; i++) {
+            values.add(
+                List.of(QueryRuleCriteriaType.GT, QueryRuleCriteriaType.GTE, QueryRuleCriteriaType.LT, QueryRuleCriteriaType.LTE)
+                    .contains(criteriaType)
+                    ? BigDecimal.valueOf(randomDoubleBetween(0, 1000, true)).setScale(2, RoundingMode.HALF_UP).toString()
+                    : randomAlphaOfLengthBetween(3, 10)
+            );
         }
+        return values;
+    }
 
+    public static QueryRuleCriteria randomQueryRuleCriteria() {
+        QueryRuleCriteriaType criteriaType = randomFrom(QueryRuleCriteriaType.values());
+        String metadata = criteriaType == QueryRuleCriteriaType.ALWAYS ? null : randomAlphaOfLengthBetween(3, 10);
+        int numValues = randomIntBetween(1, 3);
+        List<Object> values = generateRandomValues(criteriaType, numValues);
         return new QueryRuleCriteria(criteriaType, metadata, values);
     }
 

x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/QueryRuleTests.java

@@ -22,6 +22,8 @@
 import org.elasticsearch.xpack.application.EnterpriseSearchModuleTestUtils;
 import org.elasticsearch.xpack.searchbusinessrules.SpecifiedDocument;
 import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -39,6 +41,7 @@
 
 public class QueryRuleTests extends ESTestCase {
     private NamedWriteableRegistry namedWriteableRegistry;
+    private static final Logger logger = LoggerFactory.getLogger(QueryRuleTests.class);
 
     @Before
     public void registerNamedObjects() {
@@ -83,7 +86,13 @@ public void testNumericValidationWithInvalidValues() throws IOException {
                 "ids": ["id1"]
               }
             }""");
-        expectThrows(IllegalArgumentException.class, () -> QueryRule.fromXContentBytes(new BytesArray(content), XContentType.JSON));
+        IllegalArgumentException e = expectThrows(
+            IllegalArgumentException.class,
+            () -> QueryRule.fromXContentBytes(new BytesArray(content), XContentType.JSON)
+        );
+        logger.info("Actual error message for invalid values: " + e.getMessage());
+        assertTrue("Error message [" + e.getMessage() + "] should contain 'Failed to build [query_rule]'", 
+                  e.getMessage().contains("Failed to build [query_rule]"));
     }
 
     public void testNumericValidationWithMixedValues() throws IOException {
@@ -98,7 +107,13 @@ public void testNumericValidationWithMixedValues() throws IOException {
                 "ids": ["id1"]
               }
             }""");
-        expectThrows(IllegalArgumentException.class, () -> QueryRule.fromXContentBytes(new BytesArray(content), XContentType.JSON));
+        IllegalArgumentException e = expectThrows(
+            IllegalArgumentException.class,
+            () -> QueryRule.fromXContentBytes(new BytesArray(content), XContentType.JSON)
+        );
+        logger.info("Actual error message for mixed values: " + e.getMessage());
+        assertTrue("Error message [" + e.getMessage() + "] should contain 'Failed to build [query_rule]'", 
+                  e.getMessage().contains("Failed to build [query_rule]"));
     }
 
     public void testNumericValidationWithEmptyValues() throws IOException {
@@ -113,7 +128,12 @@ public void testNumericValidationWithEmptyValues() throws IOException {
                 "ids": ["id1"]
               }
             }""");
-        expectThrows(IllegalArgumentException.class, () -> QueryRule.fromXContentBytes(new BytesArray(content), XContentType.JSON));
+        IllegalArgumentException e = expectThrows(
+            IllegalArgumentException.class,
+            () -> QueryRule.fromXContentBytes(new BytesArray(content), XContentType.JSON)
+        );
+        logger.info("Actual error message: " + e.getMessage());
+        assertTrue(e.getMessage().contains("failed to parse field [criteria]"));
     }
 
     public void testToXContent() throws IOException {
@@ -140,7 +160,13 @@ public void testToXContentEmptyCriteria() throws IOException {
               "criteria": [],
               "actions": {}
             }""");
-        expectThrows(IllegalArgumentException.class, () -> QueryRule.fromXContentBytes(new BytesArray(content), XContentType.JSON));
+        IllegalArgumentException e = expectThrows(
+            IllegalArgumentException.class,
+            () -> QueryRule.fromXContentBytes(new BytesArray(content), XContentType.JSON)
+        );
+        logger.info("Actual error message for empty criteria: " + e.getMessage());
+        assertTrue("Error message [" + e.getMessage() + "] should contain 'Failed to build [query_rule]'", 
+                  e.getMessage().contains("Failed to build [query_rule]"));
     }
 
     public void testToXContentValidPinnedRulesWithIds() throws IOException {