Author: olamy Date: Fri Feb 3 11:56:22 2012 New Revision: 1240096 URL: http://svn.apache.org/viewvc?rev=1240096&view=rev Log: no need of this isWindows at least works on osx I will see if it works on asf jenkins ubuntu nodes
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=1240096&r1=1240095&r2=1240096&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:56:22 2012 @@ -56,10 +56,7 @@ public class GitCheckInCommandNoBranchTe FileUtils.deleteDirectory( repo ); FileUtils.copyDirectoryStructure( repo_orig, repo ); - ScmRepository scmRepository = Os.isFamily( Os.FAMILY_WINDOWS ) - ? getScmManager().makeScmRepository( "scm:git:file:///" + repo.getAbsolutePath() ) - : getScmManager().makeScmRepository( "scm:git:" + repo.getAbsolutePath() ); - + ScmRepository scmRepository = getScmManager().makeScmRepository( "scm:git:file:///" + 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=1240096&r1=1240095&r2=1240096&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:56:22 2012 @@ -50,14 +50,8 @@ public class GitExeCheckOutCommandNoBran workingDirectory = new File( "target/checkin-nobranch" ); FileUtils.deleteDirectory( workingDirectory ); repo = new File( "src/test/resources/repository_no_branch" ); - if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) - { - scmRepository = getScmManager().makeScmRepository( "scm:git:file:///" + repo.getAbsolutePath() ); - } - else - { - scmRepository = getScmManager().makeScmRepository( "scm:git:" + repo.getAbsolutePath() ); - } + + scmRepository = getScmManager().makeScmRepository( "scm:git:file:///" + repo.getAbsolutePath() ); } public void testCheckoutNoBranch()