group around anyOf

Author: tbee

README.md

@@ -77,6 +77,6 @@ Just include a dependency in your project. For the latest version see [Maven cen
 <dependency>
     <groupId>org.tbee.regexpbuilder</groupId>
     <artifactId>regexpbuilder</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
 </dependency>
 ```

src/main/java/org/tbee/regexpbuilder/RE.java

@@ -110,6 +110,9 @@ public RegExp carriageReturn() {
     public RegExp lineFeed() {
         return RegExp.of().lineFeed();
     }
+    public RegExp doubleQuote() {
+        return RegExp.of().doubleQuote();
+    }
 
     /**
      * Any digit, short for [0-9]

src/main/java/org/tbee/regexpbuilder/RegExp.java

@@ -191,9 +191,10 @@ public RegExp oneOrMore(String s) {
     public RegExp anyOf(RegExp... regExps) {
         boolean first = true;
         for (RegExp regExp : regExps) {
-            regExpString += (first ? "" : "|") + regExp.toString();
+            regExpString += (first ? "(" : "|") + regExp.toString();
             first = false;
         }
+        regExpString += ")";
         return this;
     }
     /**
@@ -210,7 +211,7 @@ public RegExp anyOf(String... ss) {
     }
     /**
      * Match any of the blocks of characters
-     * @param objects must be a RegExp and otherwise it will be converted to a string
+     * @param objects must be a RegExp, and otherwise it will be converted to a string
      * @return
      */
     public RegExp anyOf(Object... objects) {
@@ -310,6 +311,10 @@ public RegExp lineFeed() {
         regExpString += "\\n";
         return this;
     }
+    public RegExp doubleQuote() {
+        regExpString += "\\";
+        return this;
+    }
 
     /**
      * Any digit, short for [0-9]

src/test/java/org/tbee/regexpbuilder/RegExpTest.java

@@ -118,7 +118,30 @@ public void oneOrMoreTest() {
     public void anyOfTest() {
         RegExp regExp = RegExp.of()
                 .anyOf("^aaa", "$bbb", "(ccc", digit().word());
-        Assertions.assertEquals("\\^aaa|\\$bbb|\\(ccc|\\d\\w", regExp.toString());
+        Assertions.assertEquals("(\\^aaa|\\$bbb|\\(ccc|\\d\\w)", regExp.toString());
+    }
+
+    @Test
+    public void anyOfTest2() {
+        RegExp regExp = RegExp.of()
+                .text("For sale: ")
+                .anyOf("cat", "dog", "mouse", "snake", "bird")
+                .text(" food");
+        Assertions.assertEquals("For sale: (cat|dog|mouse|snake|bird) food", regExp.toString());
+        Matcher matcher = regExp.toMatcher("For sale: snake food");
+        Assertions.assertTrue(matcher.matches());
+    }
+
+    @Test
+    public void anyOfTest3() {
+        RegExp regExp = RegExp.of()
+                .text("For sale: ")
+                .group("animal", anyOf("cat", "dog", "mouse", "snake", "bird"))
+                .text(" food");
+        Assertions.assertEquals("For sale: ((cat|dog|mouse|snake|bird)) food", regExp.toString()); // TBEERNOT; can we reduce this to one group?
+        Matcher matcher = regExp.toMatcher("For sale: snake food");
+        Assertions.assertTrue(matcher.matches());
+        Assertions.assertEquals("snake", matcher.group(regExp.indexOf("animal")));
     }
 
     @Test
@@ -228,6 +251,7 @@ public void apacheLogTest() {
         Assertions.assertEquals("200", matcher.group(regExp.indexOf("status")));
         Assertions.assertEquals("2048", matcher.group(regExp.indexOf("size")));
     }
+
     private int countMatches(Matcher matcher) {
         int matches = 0;
         while (matcher.find()) {