rft - move classes to ru.lanwen.verbalregex package (and change it groupId)

Author: MerkushevKirill

pom.xml

@@ -7,9 +7,10 @@
         <version>9</version>
     </parent>
 
-    <groupId>ru.lanwen.verbalexpressions</groupId>
+    <groupId>ru.lanwen.verbalregex</groupId>
     <artifactId>java-verbal-expressions</artifactId>
     <version>1.0-SNAPSHOT</version>
+
     <packaging>jar</packaging>
 
     <name>JavaVerbalExpressions</name>

src/main/java/verbal/expressions/VerbalExpression.java renamed to src/main/java/ru/lanwen/verbalregex/VerbalExpression.java

@@ -1,4 +1,4 @@
-package verbal.expressions;
+package ru.lanwen.verbalregex;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -25,7 +25,8 @@ public Builder add(String pValue) {
         }
 
         public VerbalExpression build() {
-            pattern = Pattern.compile(this.prefixes.toString() + this.source.toString() + this.suffixes, this.modifiers);
+            pattern = Pattern.compile(new StringBuilder(prefixes)
+                    .append(source).append(suffixes).toString(), modifiers);
             return new VerbalExpression(this);
         }
 

src/test/java/verbal/expressions/BasicFunctionalityUnitTest.java renamed to src/test/java/ru/lanwen/verbalregex/BasicFunctionalityUnitTest.java

@@ -1,4 +1,5 @@
-package verbal.expressions;
+package ru.lanwen.verbalregex;
+
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -198,17 +199,17 @@ public void testSearchOneLine() {
         assertTrue("b is on the second line but we are only searching the first", testRegex.test("a\nb"));
     }
 
-   @Test
-   public void testGetText () {
-       String testString = "123 https://www.google.com 456";
-       VerbalExpression testRegex = new VerbalExpression.Builder().add("http")
-               .maybe("s")
-               .then("://")
-               .then("www.")
-               .anythingButNot(" ")
-               .add("com").build();
-       assertEquals(testRegex.getText(testString), "https://www.google.com");
-       
-   }
+    @Test
+    public void testGetText() {
+        String testString = "123 https://www.google.com 456";
+        VerbalExpression testRegex = new VerbalExpression.Builder().add("http")
+                .maybe("s")
+                .then("://")
+                .then("www.")
+                .anythingButNot(" ")
+                .add("com").build();
+        assertEquals(testRegex.getText(testString), "https://www.google.com");
+
+    }
 
 }

src/test/java/verbal/expressions/RealWorldUnitTest.java renamed to src/test/java/ru/lanwen/verbalregex/RealWorldUnitTest.java

@@ -1,9 +1,12 @@
-package verbal.expressions;
-
-import static org.junit.Assert.*;
+package ru.lanwen.verbalregex;
 
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
 
 public class RealWorldUnitTest {
 
@@ -23,6 +26,8 @@ public void testUrl() {
         String testUrl = "https://www.google.com";
         assertTrue("Matches Google's url", testRegex.test(testUrl)); //True
 
-        assertEquals("Regex doesn't match same regex as in example", testRegex.toString(), "^(http)(s)?(\\:\\/\\/)(www\\.)?([^\\ ]*)$");
+        assertThat("Regex doesn't match same regex as in example",
+                testRegex.toString(),
+                equalTo("^(http)(s)?(\\:\\/\\/)(www\\.)?([^\\ ]*)$"));
     }
 }