Author: struberg Date: Mon Feb 7 12:22:40 2011 New Revision: 1067932 URL: http://svn.apache.org/viewvc?rev=1067932&view=rev Log: [SCM-582] allow user authentication for http and https also
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java?rev=1067932&r1=1067931&r2=1067932&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java Mon Feb 7 12:22:40 2011 @@ -85,15 +85,15 @@ public class GitScmProviderRepositoryTes public void testLegalHttpURLWithUser() throws Exception { - testUrl( "scm:git:http://u...@gitrepos.apache.org", null, "http://gitrepos.apache.org", null, "user", + testUrl( "scm:git:http://u...@gitrepos.apache.org", null, "http://u...@gitrepos.apache.org", null, "user", null, "gitrepos.apache.org", 0 ); } public void testLegalHttpURLWithUserPassword() throws Exception { - testUrl( "scm:git:http://user:passw...@gitrepos.apache.org", null, "http://gitrepos.apache.org", null, - "user", "password", "gitrepos.apache.org", 0 ); + testUrl( "scm:git:http://user:passw...@gitrepos.apache.org", null, "http://user:passw...@gitrepos.apache.org", + null, "user", "password", "gitrepos.apache.org", 0 ); } public void testLegalHttpsURL() @@ -106,15 +106,15 @@ public class GitScmProviderRepositoryTes public void testLegalHttpsURLWithUser() throws Exception { - testUrl( "scm:git:https://u...@gitrepos.apache.org", null, "https://gitrepos.apache.org", null, "user", + testUrl( "scm:git:https://u...@gitrepos.apache.org", null, "https://u...@gitrepos.apache.org", null, "user", null, "gitrepos.apache.org", 0 ); } public void testLegalHttpsURLWithUserPassword() throws Exception { - testUrl( "scm:git:https://user:passw...@gitrepos.apache.org", null, "https://gitrepos.apache.org", null, - "user", "password", "gitrepos.apache.org", 0 ); + testUrl( "scm:git:https://user:passw...@gitrepos.apache.org", null, "https://user:passw...@gitrepos.apache.org", + null, "user", "password", "gitrepos.apache.org", 0 ); } public void testLegalSshURLWithUser() @@ -158,11 +158,11 @@ public class GitScmProviderRepositoryTes throws Exception { testUrl( "scm:git:http://usern...@gitrepos.apache.org:8800/pmgt/trunk", - null, "http://gitrepos.apache.org:8800/pmgt/trunk", + null, "http://usern...@gitrepos.apache.org:8800/pmgt/trunk", null, "username", null, "gitrepos.apache.org", 8800 ); testUrl( "scm:git:https://usern...@gitrepos.apache.org:20443/pmgt/trunk", - null, "https://gitrepos.apache.org:20443/pmgt/trunk", + null, "https://usern...@gitrepos.apache.org:20443/pmgt/trunk", null, "username", null, "gitrepos.apache.org", 20443 ); testUrl( "scm:git:git://usern...@gitrepos.apache.org:8800/pmgt/trunk", @@ -186,13 +186,13 @@ public class GitScmProviderRepositoryTes throws Exception { testUrl( "scm:git:[fetch=]http://git.apache.org/myprj.git[push=]ssh://myuser:mypassw...@git.apache.org/~/myrepo/myprj.git", - "[fetch=]http://git.apache.org/myprj.git[push=]ssh://myuser:mypassw...@git.apache.org/~/myrepo/myprj.git", - "http://git.apache.org/myprj.git", + "[fetch=]http://myuser:mypassw...@git.apache.org/myprj.git[push=]ssh://myuser:mypassw...@git.apache.org/~/myrepo/myprj.git", + "http://myuser:mypassw...@git.apache.org/myprj.git", "ssh://myuser:mypassw...@git.apache.org/~/myrepo/myprj.git", "myuser", "mypassword", "git.apache.org", 0 ); testUrl( "scm:git:[push=]ssh://myuser:mypassw...@git.apache.org/~/myrepo/myprj.git[fetch=]http://git.apache.org/myprj.git", - "[fetch=]http://git.apache.org/myprj.git[push=]ssh://myuser:mypassw...@git.apache.org/~/myrepo/myprj.git", - "http://git.apache.org/myprj.git", + "[fetch=]http://myuser:mypassw...@git.apache.org/myprj.git[push=]ssh://myuser:mypassw...@git.apache.org/~/myrepo/myprj.git", + "http://myuser:mypassw...@git.apache.org/myprj.git", "ssh://myuser:mypassw...@git.apache.org/~/myrepo/myprj.git", "myuser", "mypassword", "git.apache.org", 0 ); }