Merge pull request #6 from alenon/develop

fixed bug: regex is cut
alenon · Mar 28, 2018 · d24e69d · d24e69d
2 parents 2d3cb03 + e92fc93
commit d24e69d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/jwildcard/build.gradle b/jwildcard/build.gradle
@@ -8,7 +8,7 @@ plugins {
     id "com.jfrog.bintray" version "1.7"
 }
 
-version '1.1'
+version '1.2'
 group 'com.yevdo'
 
 repositories {

diff --git a/jwildcard/src/main/java/com/yevdo/jwildcard/JWildcard.java b/jwildcard/src/main/java/com/yevdo/jwildcard/JWildcard.java
@@ -104,7 +104,7 @@ private static String getRegexString(String wildcard, List<JWildcardPairWithInde
             cursor = index + jWildcardPairWithIndex.getRule().getKey().length();
         }
 
-        if (cursor < wildcard.length() - 1) {
+        if (cursor <= wildcard.length() - 1) {
             regex.append(Pattern.quote(wildcard.substring(cursor, wildcard.length())));
         }
         return regex.toString();

diff --git a/jwildcard/src/test/groovy/JWildcardSpec.groovy b/jwildcard/src/test/groovy/JWildcardSpec.groovy
@@ -11,7 +11,13 @@ class JWildcardSpec extends Specification {
 
     def "convert wildcard to regex"() {
         when:
-        String regex = JWildcard.wildcardToRegex("mywil?card*")
+        String regex = JWildcard.wildcardToRegex("mywil?c")
+
+        then:
+        regex == "^\\Qmywil\\E.\\Qc\\E\$"
+
+        when:
+        regex = JWildcard.wildcardToRegex("mywil?card*")
 
         then:
         regex == "^\\Qmywil\\E.\\Qcard\\E.*\$"
@@ -105,5 +111,11 @@ class JWildcardSpec extends Specification {
 
         then:
         matches
+
+        when:
+        matches = JWildcard.matches("Lond?n", "London")
+
+        then:
+        matches
     }
 }