Fix unit test by moving assert into try

Signed-off-by: Tianli Feng <[email protected]>
opensearch-project · Mar 15, 2022 · 2d36c8f · 2d36c8f
1 parent d5ce228
commit 2d36c8f
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/server/src/test/java/org/opensearch/rest/RestRequestTests.java b/server/src/test/java/org/opensearch/rest/RestRequestTests.java
@@ -295,6 +295,13 @@ public void testValidateParamValuesAreEqual() {
         request.params().put("key2", valueForKey2);
         try {
             request.validateParamValuesAreEqual("key1", "key2");
+            assertTrue(
+                "Values of the 2 keys should be equal, or having a least 1 null value or empty String. Value of key1: "
+                    + valueForKey1
+                    + ". Value of key2: "
+                    + valueForKey2,
+                Strings.isNullOrEmpty(valueForKey1) || Strings.isNullOrEmpty(valueForKey2) || valueForKey1.equals(valueForKey2)
+            );
         } catch (OpenSearchParseException e) {
             assertEquals(
                 "The values of the request parameters: [key1, key2] are required to be equal, otherwise please only assign value to one of the request parameters.",
@@ -304,10 +311,6 @@ public void testValidateParamValuesAreEqual() {
             assertFalse(Strings.isNullOrEmpty(valueForKey1));
             assertFalse(Strings.isNullOrEmpty(valueForKey2));
         }
-        assertTrue(
-            "Values of the 2 keys should be equal, or having a least 1 null value or empty String.",
-            Strings.isNullOrEmpty(valueForKey1) || Strings.isNullOrEmpty(valueForKey2) || valueForKey1.equals(valueForKey2)
-        );
     }
 
     private static RestRequest contentRestRequest(String content, Map<String, String> params) {