diff --git a/merlin-core/src/test/java/de/reinhard/merlin/word/ConditionalTest.java b/merlin-core/src/test/java/de/reinhard/merlin/word/ConditionalTest.java index 0cd987d5..83a229b0 100644 --- a/merlin-core/src/test/java/de/reinhard/merlin/word/ConditionalTest.java +++ b/merlin-core/src/test/java/de/reinhard/merlin/word/ConditionalTest.java @@ -29,13 +29,13 @@ private void assertMatcher(String str, String... groups) { if (groups.length == 0) { return; } - assertEquals(3, matcher.groupCount(), "Number of regexp group count."); - assertEquals(groups[0], matcher.group(1)); - assertEquals(groups[1], matcher.group(2)); + assertEquals(4, matcher.groupCount(), "Number of regexp group count."); + assertEquals(groups[0], matcher.group(2)); + assertEquals(groups[1], matcher.group(3)); String[] params = CSVStringUtils.parseStringList(matcher.group(3)); assertEquals(groups.length - 2, params.length, "Number of comma separated values."); - for (int i = 2; i < groups.length; i++) { - assertEquals(groups[i], params[i - 2]); + for (int i = 3; i < groups.length; i++) { + assertEquals(groups[i], params[i - 3]); } } diff --git a/merlin-core/src/test/java/de/reinhard/merlin/word/WordDocumentTest.java b/merlin-core/src/test/java/de/reinhard/merlin/word/WordDocumentTest.java index 0a70fd8e..be844e24 100644 --- a/merlin-core/src/test/java/de/reinhard/merlin/word/WordDocumentTest.java +++ b/merlin-core/src/test/java/de/reinhard/merlin/word/WordDocumentTest.java @@ -39,9 +39,9 @@ private void assertBeginIfPatternMatch(boolean expected, String str, String var, Matcher matcher = AbstractConditional.beginIfPattern.matcher(str); assertEquals(expected, matcher.find()); if (expected) { - assertEquals(var, matcher.group(1), "Variable."); - assertEquals(cmp, matcher.group(2), "Comparison."); - assertEquals(value, matcher.group(3), "Value."); + assertEquals(var, matcher.group(2), "Variable."); + assertEquals(cmp, matcher.group(3), "Comparison."); + assertEquals(value, matcher.group(4), "Value."); } }