restructure tests

Signed-off-by: Kaushal Kumar <[email protected]>

Author: kaushalmahi12

modules/autotagging-commons/src/test/java/org/opensearch/rule/action/GetRuleRequestTests.java renamed to modules/autotagging-commons/common/src/test/java/org/opensearch/rule/action/GetRuleRequestTests.java

@@ -11,24 +11,22 @@
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.rule.GetRuleRequest;
-import org.opensearch.rule.InMemoryRuleProcessingServiceTests;
 import org.opensearch.rule.autotagging.Attribute;
 import org.opensearch.rule.autotagging.Rule;
+import org.opensearch.rule.utils.RuleTestUtils;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import static org.opensearch.rule.InMemoryRuleProcessingServiceTests.WLMFeatureType;
-
 public class GetRuleRequestTests extends OpenSearchTestCase {
     /**
      * Test case to verify the serialization and deserialization of GetRuleRequest
      */
     public void testSerialization() throws IOException {
-        GetRuleRequest request = new GetRuleRequest(_ID_ONE, ATTRIBUTE_MAP, null, WLMFeatureType.WLM);
+        GetRuleRequest request = new GetRuleRequest(_ID_ONE, ATTRIBUTE_MAP, null, RuleTestUtils.MockRuleFeatureType.INSTANCE);
         assertEquals(_ID_ONE, request.getId());
         BytesStreamOutput out = new BytesStreamOutput();
         request.writeTo(out);
@@ -42,7 +40,12 @@ public void testSerialization() throws IOException {
      * Test case to verify the serialization and deserialization of GetRuleRequest when name is null
      */
     public void testSerializationWithNull() throws IOException {
-        GetRuleRequest request = new GetRuleRequest((String) null, new HashMap<>(), SEARCH_AFTER, WLMFeatureType.WLM);
+        GetRuleRequest request = new GetRuleRequest(
+            (String) null,
+            new HashMap<>(),
+            SEARCH_AFTER,
+            RuleTestUtils.MockRuleFeatureType.INSTANCE
+        );
         assertNull(request.getId());
         BytesStreamOutput out = new BytesStreamOutput();
         request.writeTo(out);
@@ -64,23 +67,23 @@ public void testSerializationWithNull() throws IOException {
     public static final String TIMESTAMP_ONE = "2024-01-26T08:58:57.558Z";
     public static final String TIMESTAMP_TWO = "2023-01-26T08:58:57.558Z";
     public static final Map<Attribute, Set<String>> ATTRIBUTE_MAP = Map.of(
-        InMemoryRuleProcessingServiceTests.TestAttribute.TEST_ATTRIBUTE,
+        RuleTestUtils.MockRuleAttributes.MOCK_RULE_ATTRIBUTE_ONE,
         Set.of(ATTRIBUTE_VALUE_ONE)
     );
 
     public static final Rule ruleOne = Rule.builder()
         .description(DESCRIPTION_ONE)
-        .featureType(WLMFeatureType.WLM)
+        .featureType(RuleTestUtils.MockRuleFeatureType.INSTANCE)
         .featureValue(FEATURE_VALUE_ONE)
         .attributeMap(ATTRIBUTE_MAP)
         .updatedAt(TIMESTAMP_ONE)
         .build();
 
     public static final Rule ruleTwo = Rule.builder()
         .description(DESCRIPTION_TWO)
-        .featureType(WLMFeatureType.WLM)
+        .featureType(RuleTestUtils.MockRuleFeatureType.INSTANCE)
         .featureValue(FEATURE_VALUE_TWO)
-        .attributeMap(Map.of(InMemoryRuleProcessingServiceTests.TestAttribute.TEST_ATTRIBUTE, Set.of(ATTRIBUTE_VALUE_TWO)))
+        .attributeMap(Map.of(RuleTestUtils.MockRuleAttributes.MOCK_RULE_ATTRIBUTE_TWO, Set.of(ATTRIBUTE_VALUE_TWO)))
         .updatedAt(TIMESTAMP_TWO)
         .build();
 

modules/autotagging-commons/src/test/java/org/opensearch/rule/action/GetRuleResponseTests.java renamed to modules/autotagging-commons/common/src/test/java/org/opensearch/rule/action/GetRuleResponseTests.java

@@ -14,9 +14,9 @@
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rule.GetRuleResponse;
-import org.opensearch.rule.InMemoryRuleProcessingServiceTests;
 import org.opensearch.rule.autotagging.Attribute;
 import org.opensearch.rule.autotagging.Rule;
+import org.opensearch.rule.utils.RuleTestUtils;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
@@ -36,13 +36,13 @@ public class GetRuleResponseTests extends OpenSearchTestCase {
     public static final String DESCRIPTION_ONE = "description_1";
     public static final String TIMESTAMP_ONE = "2024-01-26T08:58:57.558Z";
     static final Map<Attribute, Set<String>> ATTRIBUTE_MAP = Map.of(
-        InMemoryRuleProcessingServiceTests.TestAttribute.TEST_ATTRIBUTE,
+        RuleTestUtils.MockRuleAttributes.MOCK_RULE_ATTRIBUTE_ONE,
         Set.of(ATTRIBUTE_VALUE_ONE)
     );
 
     public static final Rule ruleOne = Rule.builder()
         .description(DESCRIPTION_ONE)
-        .featureType(InMemoryRuleProcessingServiceTests.WLMFeatureType.WLM)
+        .featureType(RuleTestUtils.MockRuleFeatureType.INSTANCE)
         .featureValue(FEATURE_VALUE_ONE)
         .attributeMap(ATTRIBUTE_MAP)
         .updatedAt(TIMESTAMP_ONE)
@@ -111,10 +111,10 @@ public void testToXContentGetSingleRule() throws IOException {
             + "    {\n"
             + "      \"_id\" : \"id_1\",\n"
             + "      \"description\" : \"description_1\",\n"
-            + "      \"test_attribute\" : [\n"
+            + "      \"mock_attribute_one\" : [\n"
             + "        \"mock_attribute_one\"\n"
             + "      ],\n"
-            + "      \"wlm\" : \"feature_value_one\",\n"
+            + "      \"mock_feature_type\" : \"feature_value_one\",\n"
             + "      \"updated_at\" : \"2024-01-26T08:58:57.558Z\"\n"
             + "    }\n"
             + "  ],\n"

modules/autotagging-commons/src/test/java/org/opensearch/rule/autotagging/AutoTaggingRegistryTests.java renamed to modules/autotagging-commons/common/src/test/java/org/opensearch/rule/autotagging/AutoTaggingRegistryTests.java

@@ -17,15 +17,9 @@
 
 public class RuleTestUtils {
     public static final String _ID_ONE = "AgfUO5Ja9yfvhdONlYi3TQ==";
-    public static final String _ID_TWO = "G5iIq84j7eK1qIAAAAIH53=1";
-    public static final String FEATURE_VALUE_ONE = "feature_value_one";
-    public static final String FEATURE_VALUE_TWO = "feature_value_two";
     public static final String ATTRIBUTE_VALUE_ONE = "mock_attribute_one";
     public static final String ATTRIBUTE_VALUE_TWO = "mock_attribute_two";
     public static final String DESCRIPTION_ONE = "description_1";
-    public static final String DESCRIPTION_TWO = "description_2";
-    public static final String TIMESTAMP_ONE = "2024-01-26T08:58:57.558Z";
-    public static final String TIMESTAMP_TWO = "2023-01-26T08:58:57.558Z";
     public static final String FEATURE_TYPE_NAME = "mock_feature_type";
     public static final String TEST_INDEX_NAME = ".test_index_for_rule";
     public static final Map<Attribute, Set<String>> ATTRIBUTE_MAP = Map.of(