Changed the test for RegexValidator class (#608)

* Created the MapperExtension interface and added the MapperPlugin content Signed-off-by: Kuanysh <[email protected]> * deleted comments Signed-off-by: Kuanysh <[email protected]> * add javadoc Signed-off-by: Kuanysh <[email protected]> * add unit test Signed-off-by: Kuanysh <[email protected]> * refactor for unit test Signed-off-by: Kuanysh <[email protected]> * fix bugs Signed-off-by: Kuanysh <[email protected]> * code refactoring Signed-off-by: Kuanysh <[email protected]> * change test Signed-off-by: Kuanysh <[email protected]> * code refactoring Signed-off-by: Kuanysh <[email protected]> * shortened the code Signed-off-by: Kuanysh <[email protected]> * add false parametr Signed-off-by: Kuanysh <[email protected]> * code rafactoring Signed-off-by: Kuanysh <[email protected]> * Remove stray file from old commit that survived rebase Signed-off-by: Daniel Widdis <[email protected]> --------- Signed-off-by: Kuanysh <[email protected]> Signed-off-by: Daniel Widdis <[email protected]> Co-authored-by: Daniel Widdis <[email protected]> (cherry picked from commit a7a8164) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Apr 7, 2023 · b52469d · b52469d
1 parent ec8d6b9
commit b52469d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/org/opensearch/sdk/sample/helloworld/ExampleCustomSettingConfig.java b/src/main/java/org/opensearch/sdk/sample/helloworld/ExampleCustomSettingConfig.java
@@ -17,16 +17,14 @@
  * {@link ExampleCustomSettingConfig} contains the custom settings value and their static declarations.
  */
 public class ExampleCustomSettingConfig {
-    private static final String FORBIDDEN_REGEX = "forbidden";
-
+    private static final String FORBIDDEN_VALUE = "forbidden";
     /**
-     * A string setting. If the string setting matches the FORBIDDEN_REGEX string, the validation will fail.
+     * A string setting. If the string setting matches the FORBIDDEN_REGEX string and parameter isMatching is true the validation will fail.
      */
     public static final Setting<String> VALIDATED_SETTING = Setting.simpleString(
         "custom.validate",
-        new RegexValidator(FORBIDDEN_REGEX),
+        new RegexValidator(FORBIDDEN_VALUE, false),
         Property.NodeScope,
         Property.Dynamic
     );
-
 }
diff --git a/src/test/java/org/opensearch/sdk/sample/helloworld/TestHelloWorldExtension.java b/src/test/java/org/opensearch/sdk/sample/helloworld/TestHelloWorldExtension.java
@@ -245,15 +245,17 @@ public void onFailure(Exception e) {
         assertEquals("failed to find action [" + UnregisteredAction.INSTANCE + "] to execute", ex.getMessage());
     }
 
+    @Test
     public void testValidatedSettings() {
-        final String expected = randomAlphaOfLengthBetween(1, 5);
+        final String expected = "foo";
         final String actual = VALIDATED_SETTING.get(Settings.builder().put(VALIDATED_SETTING.getKey(), expected).build());
         assertEquals(expected, actual);
 
-        final IllegalArgumentException exception = expectThrows(
+        final IllegalArgumentException exceptionTrue = expectThrows(
             IllegalArgumentException.class,
-            () -> VALIDATED_SETTING.get(Settings.builder().put("custom.validated", "it's forbidden").build())
+            () -> VALIDATED_SETTING.get(Settings.builder().put(VALIDATED_SETTING.getKey(), "it's forbidden").build())
         );
-        assertEquals("Setting must not contain [forbidden]", exception.getMessage());
+
+        assertEquals("Setting [it's forbidden] must match regex [forbidden]", exceptionTrue.getMessage());
     }
 }