add - simplify endCapture, add tests for null or

Author: MerkushevKirill

src/main/java/ru/lanwen/verbalregex/VerbalExpression.java

@@ -280,7 +280,7 @@ public Builder capture() {
          * @return this builder
          */
         public Builder endCapture() {
-            if(this.suffixes.length() > 0 && this.suffixes.indexOf(")") + 1 == this.suffixes.length()) {
+            if(this.suffixes.indexOf(")") != -1) {
                 this.suffixes.setLength(suffixes.length() - 1);
                 return this.add(")");
             } else {

src/test/java/ru/lanwen/verbalregex/NegativeCasesTest.java

@@ -4,7 +4,9 @@
 
 import java.util.regex.PatternSyntaxException;
 
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -43,4 +45,25 @@ public void rangeWithThreeArgsUsesOnlyFirstTwo() throws Exception {
 
         assertThat("Range with three args differs from expected", regex.toString(), equalTo("^[a-z]"));
     }
+
+    @Test
+    public void orWithNullMatchesAny() throws Exception {
+        VerbalExpression regex = VerbalExpression.regex().startOfLine().then("a").or(null).build();
+        assertThat("regex don't matches writed letter", regex.test("a"), is(true));
+        assertThat("or(null) should match any", regex.test("bcd"), is(true));
+
+        assertThat("or(null) extract only first", regex.getText("abcd"), equalTo("a"));
+    }
+
+    @Test
+    public void orAfterCaptureProduceEmptyGroup() throws Exception {
+        VerbalExpression regex = VerbalExpression.regex().startOfLine().then("a").capture().or("b").build();
+
+        assertThat(regex.toString(), containsString("()|"));
+
+        assertThat("regex dont matches string abcd", regex.getText("abcd", 0), equalTo("a"));
+        assertThat("regex dont extract a by first group", regex.getText("abcd", 1), equalTo("a"));
+        assertThat("second group should produce empty string", regex.getText("abcd", 2), equalTo(""));
+
+    }
 }