You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/03/17 11:32:12 UTC

svn commit: r1578289 - in /myfaces/tobago/trunk/tobago-core/src: main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java test/java/org/apache/myfaces/tobago/internal/util/StringUtilsUnitTest.java

Author: lofwyr
Date: Mon Mar 17 10:32:11 2014
New Revision: 1578289

URL: http://svn.apache.org/r1578289
Log:
TOBAGO-1374: link attribute contains faces mapping
 - ensure there is at least one character as protocol name

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
    myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/StringUtilsUnitTest.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java?rev=1578289&r1=1578288&r2=1578289&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java Mon Mar 17 10:32:11 2014
@@ -452,7 +452,7 @@ public final class StringUtils {
       return false;
     }
     int colon = link.indexOf(':');
-    if (colon < 0) {
+    if (colon < 1) {
       return false;
     }
     for (int i = 0; i < colon; i++) {

Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/StringUtilsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/StringUtilsUnitTest.java?rev=1578289&r1=1578288&r2=1578289&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/StringUtilsUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/StringUtilsUnitTest.java Mon Mar 17 10:32:11 2014
@@ -37,4 +37,18 @@ public class StringUtilsUnitTest {
     Assert.assertFalse(StringUtils.equalsIgnoreCaseAndWhitespace(";", ";;"));
     Assert.assertFalse(StringUtils.equalsIgnoreCaseAndWhitespace(" a ", " ä "));
   }
+
+  @Test
+  public void testIsUrl() {
+    Assert.assertTrue(StringUtils.isUrl("http://www.apache.org/"));
+    Assert.assertTrue(StringUtils.isUrl("http:"));
+    Assert.assertTrue(StringUtils.isUrl("ftp:"));
+    Assert.assertTrue(StringUtils.isUrl("abc:fjdskal:fdsa"));
+
+    Assert.assertFalse(StringUtils.isUrl(null));
+    Assert.assertFalse(StringUtils.isUrl("null"));
+    Assert.assertFalse(StringUtils.isUrl("/test"));
+    Assert.assertFalse(StringUtils.isUrl("test.xhtml?id=#page:input"));
+    Assert.assertFalse(StringUtils.isUrl(":test"));
+  }
 }