You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/02/03 12:46:17 UTC
svn commit: r1240094 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command: checkin/ checkout/

Author: olamy
Date: Fri Feb  3 11:46:16 2012
New Revision: 1240094

URL: http://svn.apache.org/viewvc?rev=1240094&view=rev
Log:
trying to fix windauze issue

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java?rev=1240094&r1=1240093&r2=1240094&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java Fri Feb  3 11:46:16 2012
@@ -27,6 +27,7 @@ import org.apache.maven.scm.command.chec
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.Os;
 
 import java.io.File;
 
@@ -55,7 +56,9 @@ public class GitCheckInCommandNoBranchTe
         FileUtils.deleteDirectory( repo );
         FileUtils.copyDirectoryStructure( repo_orig, repo );
 
-        ScmRepository scmRepository = getScmManager().makeScmRepository( "svn:git:" + repo.getAbsolutePath() );
+        ScmRepository scmRepository = Os.isFamily( Os.FAMILY_WINDOWS )
+            ? getScmManager().makeScmRepository( "scm:git:file:///" + repo.getAbsolutePath() )
+            : getScmManager().makeScmRepository( "scm:git:" + repo.getAbsolutePath() );
 
         CheckOutScmResult checkOutScmResult = checkoutRepo( scmRepository );
         assertEquals( 0, checkOutScmResult.getCheckedOutFiles().size() );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java?rev=1240094&r1=1240093&r2=1240094&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java Fri Feb  3 11:46:16 2012
@@ -25,6 +25,7 @@ import org.apache.maven.scm.ScmVersion;
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.Os;
 
 import java.io.File;
 
@@ -49,7 +50,14 @@ public class GitExeCheckOutCommandNoBran
         workingDirectory = new File( "target/checkin-nobranch" );
         FileUtils.deleteDirectory( workingDirectory );
         repo = new File( "src/test/resources/repository_no_branch" );
-        scmRepository = getScmManager().makeScmRepository( "svn:git:" + repo.getAbsolutePath() );
+        if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+        {
+            scmRepository = getScmManager().makeScmRepository( "scm:git:file:///" + repo.getAbsolutePath() );
+        }
+        else
+        {
+            scmRepository = getScmManager().makeScmRepository( "scm:git:" + repo.getAbsolutePath() );
+        }
     }
 
     public void testCheckoutNoBranch()