chore: Refactor some duplicate code and join assetions

Author: en-milie

src/main/java/com/endava/cats/dsl/impl/MiniDslParser.java

@@ -180,15 +180,12 @@ private int findMatchingBrace(String s, int startIdx) {
         if (open < 0) return -1;
 
         int depth = 0;
-        boolean inSingle = false, inDouble = false;
+        boolean[] quoteState = new boolean[2];
         for (int i = open; i < s.length(); i++) {
             char c = s.charAt(i);
-            if (c == '\'' && !inDouble) {
-                inSingle = !inSingle;
-            } else if (c == '"' && !inSingle) {
-                inDouble = !inDouble;
-            }
-            if (inSingle || inDouble) {
+            updateQuoteState(c, quoteState);
+
+            if (quoteState[0] || quoteState[1]) {
                 continue;
             }
 
@@ -246,7 +243,7 @@ private Object readJsonPath(String json, String path) {
         if (json == null || json.isBlank()) return null;
         try {
             return JsonPath.read(json, path);
-        } catch (Exception ignored) {
+        } catch (Exception _) {
             return null;
         }
     }
@@ -286,17 +283,14 @@ private InstanceCall tryParseInstanceCall(String expr) {
 
     private int findTopLevelDotBeforeMethodCall(String expr) {
         int depthParen = 0;
-        boolean inSingle = false, inDouble = false;
+        boolean[] quoteState = new boolean[2];
 
         for (int i = 0; i < expr.length(); i++) {
             char c = expr.charAt(i);
 
-            if (c == '\'' && !inDouble) {
-                inSingle = !inSingle;
-            } else if (c == '"' && !inSingle) {
-                inDouble = !inDouble;
-            }
-            if (inSingle || inDouble) {
+            updateQuoteState(c, quoteState);
+
+            if (quoteState[0] || quoteState[1]) {
                 continue;
             }
 
@@ -458,6 +452,7 @@ private boolean areArgsCompatible(Class<?>[] params, Object[] args) {
                     continue;
                 }
                 default -> {
+                    //do nothing
                 }
             }
 

src/test/java/com/endava/cats/dsl/impl/MiniDslParserTest.java

@@ -59,7 +59,7 @@ void shouldHandleEmptyExpression() {
         void shouldHandleWhitespaceExpression() {
             String result = parser.parse("   ", context);
 
-            assertThat(result).isEqualTo("");
+            assertThat(result).isEmpty();
         }
     }
 
@@ -216,26 +216,23 @@ void shouldEvaluateOffsetDateTimeNow() {
         void shouldEvaluateCatsRandomAlphanumeric() {
             String result = parser.parse("T(com.endava.cats.util.CatsRandom).alphanumeric(10)", context);
 
-            assertThat(result).hasSize(10);
-            assertThat(result).matches("[a-zA-Z0-9]+");
+            assertThat(result).hasSize(10).matches("[a-zA-Z0-9]+");
         }
 
         @Test
         @DisplayName("Should evaluate CatsRandom alphabetic")
         void shouldEvaluateCatsRandomAlphabetic() {
             String result = parser.parse("T(com.endava.cats.util.CatsRandom).alphabetic(5)", context);
 
-            assertThat(result).hasSize(5);
-            assertThat(result).matches("[a-zA-Z]+");
+            assertThat(result).hasSize(5).matches("[a-zA-Z]+");
         }
 
         @Test
         @DisplayName("Should evaluate CatsRandom numeric")
         void shouldEvaluateCatsRandomNumeric() {
             String result = parser.parse("T(com.endava.cats.util.CatsRandom).numeric(8)", context);
 
-            assertThat(result).hasSize(8);
-            assertThat(result).matches("[0-9]+");
+            assertThat(result).hasSize(8).matches("[0-9]+");
         }
 
         @Test
@@ -672,7 +669,7 @@ class EdgeCaseTests {
         void shouldHandleExpressionWithOnlyWhitespaceAfterTrim() {
             String result = parser.parse("   ", context);
 
-            assertThat(result).isEqualTo("");
+            assertThat(result).isEmpty();
         }
 
         @Test
@@ -726,8 +723,7 @@ void shouldHandleIdentifierPath() {
         void shouldHandleNumericRangeInCatsRandom() {
             String result = parser.parse("T(com.endava.cats.util.CatsRandom).numeric(5, 10)", context);
 
-            assertThat(result).hasSizeBetween(5, 9);
-            assertThat(result).matches("[0-9]+");
+            assertThat(result).hasSizeBetween(5, 9).matches("[0-9]+");
         }
 
         @Test
@@ -799,8 +795,7 @@ void shouldHandlePeriodOfDays() {
         void shouldHandleRandomStringUtilsRandom() {
             String result = parser.parse("T(org.apache.commons.lang3.RandomStringUtils).randomAlphabetic(5)", context);
 
-            assertThat(result).hasSize(5);
-            assertThat(result).matches("[a-zA-Z]+");
+            assertThat(result).hasSize(5).matches("[a-zA-Z]+");
         }
 
         @Test