You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by de...@apache.org on 2010/05/14 08:59:26 UTC

svn commit: r944139 - in /maven/wagon/trunk/wagon-provider-api/src: main/java/org/apache/maven/wagon/PathUtils.java test/java/org/apache/maven/wagon/PathUtilsTest.java

Author: dennisl
Date: Fri May 14 06:59:26 2010
New Revision: 944139

URL: http://svn.apache.org/viewvc?rev=944139&view=rev
Log:
[WAGON-307] Wrong basedir returned for URL without protocol in PathUtils

Modified:
    maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java
    maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/PathUtilsTest.java

Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java?rev=944139&r1=944138&r2=944139&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java (original)
+++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java Fri May 14 06:59:26 2010
@@ -145,7 +145,10 @@ public final class PathUtils
         }
     }
 
-    private static String authorization( final String url )
+    /**
+     * This was changed from private to package local so that it can be unit tested.
+     */
+    static String authorization( final String url )
     {
         if ( url == null )
         {
@@ -355,7 +358,7 @@ public final class PathUtils
 
             final int port = PathUtils.port( url );
 
-            int pos;
+            int pos = 0;
 
             if ( protocol.equalsIgnoreCase( "scm" ) )
             {
@@ -364,7 +367,10 @@ public final class PathUtils
             }
             else
             {
-                pos = url.indexOf( "://" ) + 3;
+                int index = url.indexOf( "://" );
+                if( index != -1 ) {
+                    pos = index + 3;
+                }
             }
 
             pos += authorization.length();

Modified: maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/PathUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/PathUtilsTest.java?rev=944139&r1=944138&r2=944139&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/PathUtilsTest.java (original)
+++ maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/PathUtilsTest.java Fri May 14 06:59:26 2010
@@ -196,6 +196,21 @@ public class PathUtilsTest
         assertEquals( "/", PathUtils.basedir( "HTTP://www.codehaus.org/" ) );
     }
 
+    public void testEmptyProtocol()
+    {
+        assertEquals( "", PathUtils.protocol( "placeholder-only" ) );
+        assertEquals( "", PathUtils.protocol( "placeholder-only/module-a" ) );
+
+        assertEquals( "placeholder-only", PathUtils.authorization( "placeholder-only" ) );
+        assertEquals( "placeholder-only", PathUtils.authorization( "placeholder-only/module-a" ) );
+
+        assertEquals( -1, PathUtils.port( "placeholder-only" ) );
+        assertEquals( -1, PathUtils.port( "placeholder-only/module-a" ) );
+
+        assertEquals( "/", PathUtils.basedir( "placeholder-only" ) );
+        assertEquals( "/module-a", PathUtils.basedir( "placeholder-only/module-a" ) );
+    }
+
     public void testPortResolving()
     {
         assertEquals( 80, PathUtils.port( "http://www.codehause.org:80/maven" ) );



---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org