fix for issue #279

codehaus-plexus · Nov 5, 2024 · 46d98a6 · 46d98a6
1 parent 1f55ae1
commit 46d98a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/codehaus/plexus/util/SelectorUtils.java b/src/main/java/org/codehaus/plexus/util/SelectorUtils.java
@@ -140,7 +140,7 @@ public static boolean matchPatternStart(String pattern, String str, boolean isCa
     }
 
     public static boolean isAntPrefixedPattern(String pattern) {
-        return pattern.length() > (ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1)
+        return pattern.length() > (ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length())
                 && pattern.startsWith(ANT_HANDLER_PREFIX)
                 && pattern.endsWith(PATTERN_HANDLER_SUFFIX);
     }
@@ -254,7 +254,7 @@ private static String toOSRelatedPath(String pattern, String separator) {
     }
 
     public static boolean isRegexPrefixedPattern(String pattern) {
-        return pattern.length() > (REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1)
+        return pattern.length() > (REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length())
                 && pattern.startsWith(REGEX_HANDLER_PREFIX)
                 && pattern.endsWith(PATTERN_HANDLER_SUFFIX);
     }

diff --git a/src/test/java/org/codehaus/plexus/util/SelectorUtilsTest.java b/src/test/java/org/codehaus/plexus/util/SelectorUtilsTest.java
@@ -49,7 +49,7 @@ public void testExtractPattern() {
      */
     @Test
     public void testIsAntPrefixedPattern() {
-        assertFalse(SelectorUtils.isAntPrefixedPattern("%ant[A]")); // single char not allowed
+        assertTrue(SelectorUtils.isAntPrefixedPattern("%ant[A]")); // single char not allowed
         assertTrue(SelectorUtils.isAntPrefixedPattern("%ant[AB]"));
         assertFalse(SelectorUtils.isAntPrefixedPattern("%ant[]"));
         assertFalse(SelectorUtils.isAntPrefixedPattern("*"));
@@ -60,7 +60,7 @@ public void testIsAntPrefixedPattern() {
      */
     @Test
     public void testIsRegexPrefixedPattern() {
-        assertFalse(SelectorUtils.isRegexPrefixedPattern("%regex[A]")); // single char not allowed
+        assertTrue(SelectorUtils.isRegexPrefixedPattern("%regex[A]")); // single char not allowed
         assertTrue(SelectorUtils.isRegexPrefixedPattern("%regex[.*]"));
         assertFalse(SelectorUtils.isRegexPrefixedPattern("%regex[]"));
         assertFalse(SelectorUtils.isRegexPrefixedPattern("*"));