Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
 Wed May 21 12:24:03 2008
@@ -55,6 +55,6 @@
         VssEditCommand command = new VssEditCommand();
         Commandline cl = command.buildCmdLine( (VssScmProviderRepository) 
repository.getProviderRepository(), fileSet );
         String ssPath = VssCommandLineUtils.getSsDir().replace( '/', 
File.separatorChar );
-        assertEquals( ssPath + "ss Checkout $D:/myProject -Yusername,password 
-R -I-", cl.toString() );
+        assertCommandLine( ssPath + "ss Checkout $D:/myProject 
-Yusername,password -R -I-", fileSet.getBasedir(), cl );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommandTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommandTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommandTest.java
 Wed May 21 12:24:03 2008
@@ -55,6 +55,6 @@
         VssStatusCommand command = new VssStatusCommand();
         Commandline cl = command.buildCmdLine( (VssScmProviderRepository) 
repository.getProviderRepository(), fileSet );
         String ssPath = VssCommandLineUtils.getSsDir().replace( '/', 
File.separatorChar );
-        assertEquals( ssPath + "ss Diff $D:/myProject -Yusername,password -R 
-I-", cl.toString() );
+        assertCommandLine( ssPath + "ss Diff $D:/myProject -Yusername,password 
-R -I-", fileSet.getBasedir(), cl );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommandTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommandTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommandTest.java
 Wed May 21 12:24:03 2008
@@ -56,6 +56,6 @@
         Commandline cl =
             command.buildCmdLine( (VssScmProviderRepository) 
repository.getProviderRepository(), fileSet, null );
         String ssPath = VssCommandLineUtils.getSsDir().replace( '/', 
File.separatorChar );
-        assertEquals( ssPath + "ss Get $D:/myProject -Yusername,password -R 
-I- -GWS", cl.toString() );
+        assertCommandLine( ssPath + "ss Get $D:/myProject -Yusername,password 
-R -I- -GWS", fileSet.getBasedir(), cl );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
 Wed May 21 12:24:03 2008
@@ -20,6 +20,7 @@
  */
 
 import org.apache.maven.scm.ChangeSet;
+import org.apache.maven.scm.log.DefaultLog;
 import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
 
 import java.io.BufferedReader;
@@ -63,7 +64,7 @@
     public void testParse()
         throws Exception
     {
-        CvsChangeLogConsumer command = new CvsChangeLogConsumer( null, null );
+        CvsChangeLogConsumer command = new CvsChangeLogConsumer( new 
DefaultLog(), null );
 
         FileInputStream fis = new FileInputStream( testFile );
         BufferedReader in = new BufferedReader( new InputStreamReader( fis ) );

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/changelog/GitChangeLogCommandTest.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/changelog/GitChangeLogCommandTest.java?rev=658820&r1=658819&r2=658820&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/changelog/GitChangeLogCommandTest.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/changelog/GitChangeLogCommandTest.java
 Wed May 21 12:24:03 2008
@@ -20,9 +20,9 @@
  */
 
 import org.apache.maven.scm.ScmBranch;
+import org.apache.maven.scm.ScmRevision;
 import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.ScmVersion;
-import org.apache.maven.scm.ScmRevision;
 import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
@@ -41,14 +41,13 @@
     public void testCommandLineNoDates()
         throws Exception
     {
-        testCommandLine( "scm:git:http://foo.com/git";, null, null, null,
-                         "git log" );
+        testCommandLine( "scm:git:http://foo.com/git";, null, null, null, "git 
log" );
     }
 
     public void testCommandLineWithDates()
         throws Exception
     {
-        Date startDate = getDate( 2003, Calendar.SEPTEMBER, 10,  GMT_TIME_ZONE 
);
+        Date startDate = getDate( 2003, Calendar.SEPTEMBER, 10, GMT_TIME_ZONE 
);
         Date endDate = getDate( 2007, Calendar.OCTOBER, 10, GMT_TIME_ZONE );
 
         testCommandLine( "scm:git:http://foo.com/git";, null, startDate, 
endDate,
@@ -87,29 +86,27 @@
     public void testCommandLineWithBranchNoDates()
         throws Exception
     {
-        testCommandLine( "scm:git:http://foo.com/git";, new ScmBranch( 
"my-test-branch" ), null, null,
-                         "git log" );
+        testCommandLine( "scm:git:http://foo.com/git";, new ScmBranch( 
"my-test-branch" ), null, null, "git log" );
     }
 
 
     public void testCommandLineWithStartVersion()
         throws Exception
     {
-        testCommandLine( "scm:git:http://foo.com/git";, new ScmRevision("1"), 
null,
-                         "git log --since=1" );
+        testCommandLine( "scm:git:http://foo.com/git";, new ScmRevision( "1" ), 
null, "git log --since=1" );
     }
 
     public void testCommandLineWithStartVersionAndEndVersion()
         throws Exception
     {
-        testCommandLine( "scm:git:http://foo.com/git";, new ScmRevision("1"), 
new ScmRevision("10"),
+        testCommandLine( "scm:git:http://foo.com/git";, new ScmRevision( "1" ), 
new ScmRevision( "10" ),
                          "git log --since=1 --until=10" );
     }
 
     public void testCommandLineWithStartVersionAndEndVersionEquals()
         throws Exception
     {
-        testCommandLine( "scm:git:http://foo.com/git";, new ScmRevision("1"), 
new ScmRevision("1"),
+        testCommandLine( "scm:git:http://foo.com/git";, new ScmRevision( "1" ), 
new ScmRevision( "1" ),
                          "git log --since=1 --until=1" );
     }
 
@@ -129,7 +126,7 @@
         Commandline cl = GitChangeLogCommand.createCommandLine( gitRepository, 
workingDirectory, branch, startDate,
                                                                 endDate, null, 
null );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory, cl );
     }
 
     private void testCommandLine( String scmUrl, ScmVersion startVersion, 
ScmVersion endVersion, String commandLine )
@@ -144,6 +141,6 @@
         Commandline cl = GitChangeLogCommand.createCommandLine( gitRepository, 
workingDirectory, null, null, null,
                                                                 startVersion, 
endVersion );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory, cl );
     }
 }

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/GitCheckInCommandTest.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/GitCheckInCommandTest.java?rev=658820&r1=658819&r2=658820&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/GitCheckInCommandTest.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/GitCheckInCommandTest.java
 Wed May 21 12:24:03 2008
@@ -81,6 +81,6 @@
         Commandline cl =
             GitCheckInCommand.createCommitCommandLine( gitRepository, new 
ScmFileSet( workingDirectory ), messageFile );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory, cl );
     }
 }

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/GitCheckOutCommandTest.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/GitCheckOutCommandTest.java?rev=658820&r1=658819&r2=658820&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/GitCheckOutCommandTest.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/GitCheckOutCommandTest.java
 Wed May 21 12:24:03 2008
@@ -56,8 +56,7 @@
     public void testCommandLineWithBranch()
         throws Exception
     {
-        testCommandLine( getScmManager(), "scm:git:http://foo.com/git";, 
"mybranch",
-                         "git checkout mybranch" );
+        testCommandLine( getScmManager(), "scm:git:http://foo.com/git";, 
"mybranch", "git checkout mybranch" );
     }
 
     // ----------------------------------------------------------------------
@@ -71,9 +70,9 @@
 
         GitScmProviderRepository gitRepository = (GitScmProviderRepository) 
repository.getProviderRepository();
 
-        Commandline cl = GitCheckOutCommand.createCommandLine( gitRepository, 
workingDirectory,
-                                                               new 
ScmRevision( revision ) );
+        Commandline cl =
+            GitCheckOutCommand.createCommandLine( gitRepository, 
workingDirectory, new ScmRevision( revision ) );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory, cl );
     }
 }

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/tag/GitTagCommandTest.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/tag/GitTagCommandTest.java?rev=658820&r1=658819&r2=658820&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/tag/GitTagCommandTest.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/tag/GitTagCommandTest.java
 Wed May 21 12:24:03 2008
@@ -19,8 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
 import org.apache.maven.scm.repository.ScmRepository;
@@ -53,21 +51,18 @@
         messageFileString = "-F " + path;
     }
 
-    
+
     public void testCommandLineTag()
         throws Exception
     {
-        testCommandLine( "scm:git:http://foo.com/git/trunk";
-                       , "my-tag-1"
-                       , "git tag " + messageFileString + " my-tag-1" );
+        testCommandLine( "scm:git:http://foo.com/git/trunk";, "my-tag-1", "git 
tag " + messageFileString + " my-tag-1" );
     }
 
     public void testCommandLineWithUsernameAndTag()
         throws Exception
     {
-        testCommandLine( "scm:git:http://[EMAIL PROTECTED]/git/trunk"
-                       , "my-tag-1"  
-                       ,  "git tag " + messageFileString + " my-tag-1" );
+        testCommandLine( "scm:git:http://[EMAIL PROTECTED]/git/trunk", 
"my-tag-1",
+                         "git tag " + messageFileString + " my-tag-1" );
     }
 
     // ----------------------------------------------------------------------
@@ -83,9 +78,8 @@
 
         GitScmProviderRepository gitRepository = (GitScmProviderRepository) 
repository.getProviderRepository();
 
-        Commandline cl =
-            GitTagCommand.createCommandLine( gitRepository, workingDirectory, 
tag, messageFile );
+        Commandline cl = GitTagCommand.createCommandLine( gitRepository, 
workingDirectory, tag, messageFile );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory, cl );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
 Wed May 21 12:24:03 2008
@@ -19,8 +19,9 @@
  * under the License.
  */
 
-import junit.framework.TestCase;
+import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
+import org.codehaus.plexus.util.cli.Commandline;
 
 import java.io.File;
 
@@ -29,7 +30,7 @@
  * @version $Id$
  */
 public class SvnCommandLineUtilsTest
-    extends TestCase
+    extends ScmTestCase
 {
     public void testCryptPassword()
     {
@@ -37,11 +38,14 @@
             new SvnScmProviderRepository( 
"https://svn.apache.org/repos/asf/maven/scm/trunk";, "username", "password" );
         String clString =
             SvnCommandLineUtils.cryptPassword( 
SvnCommandLineUtils.getBaseSvnCommandLine( new File( "." ), repo ) );
-        assertEquals( "svn --username username --password ***** 
--non-interactive", clString );
+        Commandline expectedCmd = new Commandline( "svn --username username 
--password ***** --non-interactive" );
+        expectedCmd.setWorkingDirectory( new File( "." ).getAbsolutePath() );
+        assertEquals( expectedCmd.toString(), clString );
 
         repo = new SvnScmProviderRepository( 
"https://svn.apache.org/repos/asf/maven/scm/trunk";, "username", null );
         clString =
             SvnCommandLineUtils.cryptPassword( 
SvnCommandLineUtils.getBaseSvnCommandLine( new File( "." ), repo ) );
-        assertEquals( "svn --username username --non-interactive", clString );
+        assertCommandLine( "svn --username username --non-interactive", new 
File( "." ),
+                           SvnCommandLineUtils.getBaseSvnCommandLine( new 
File( "." ), repo ) );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
 Wed May 21 12:24:03 2008
@@ -59,6 +59,6 @@
 
         Commandline cl = SvnBranchCommand.createCommandLine( svnRepository, 
workingDirectory, branch, messageFile );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory, cl );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
 Wed May 21 12:24:03 2008
@@ -157,7 +157,7 @@
         Commandline cl = SvnChangeLogCommand.createCommandLine( svnRepository, 
workingDirectory, branch, startDate,
                                                                 endDate, null, 
null );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory, cl );
     }
 
     private void testCommandLine( String scmUrl, ScmVersion startVersion, 
ScmVersion endVersion, String commandLine )
@@ -172,6 +172,6 @@
         Commandline cl = SvnChangeLogCommand.createCommandLine( svnRepository, 
workingDirectory, null, null, null,
                                                                 startVersion, 
endVersion );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory, cl );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
 Wed May 21 12:24:03 2008
@@ -95,6 +95,6 @@
         Commandline cl =
             SvnCheckInCommand.createCommandLine( svnRepository, new 
ScmFileSet( workingDirectory ), messageFile );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory, cl );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java
 Wed May 21 12:24:03 2008
@@ -89,6 +89,6 @@
         Commandline cl = SvnCheckOutCommand.createCommandLine( svnRepository, 
workingDirectory,
                                                                new 
ScmRevision( revision ), svnRepository.getUrl() );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory.getParentFile(), cl );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java
 Wed May 21 12:24:03 2008
@@ -93,6 +93,7 @@
         Commandline cl = SvnListCommand.createCommandLine( getSvnRepository( 
scmUrl ), fileSet, recursive,
                                                            new ScmRevision( 
revision ) );
 
-        assertEquals( commandLine + " http://foo.com/svn/trunk/.";, 
cl.toString() );
+        assertCommandLine( commandLine + " http://foo.com/svn/trunk/.";,
+                           new File( System.getProperty( "java.io.tmpdir" ) ), 
cl );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
 Wed May 21 12:24:03 2008
@@ -59,6 +59,6 @@
 
         Commandline cl = SvnTagCommand.createCommandLine( svnRepository, 
workingDirectory, tag, messageFile );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory, cl );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
 Wed May 21 12:24:03 2008
@@ -167,6 +167,6 @@
 
         Commandline cl = SvnUpdateCommand.createCommandLine( getSvnRepository( 
scmUrl ), workingDirectory, version );
 
-        assertEquals( commandLine, cl.toString() );
+        assertCommandLine( commandLine, workingDirectory, cl );
     }
 }

Modified: 
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
 (original)
+++ 
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
 Wed May 21 12:24:03 2008
@@ -306,4 +306,16 @@
 
         return cal.getTime();
     }
+
+    public void assertCommandLine( String expectedCommand, File 
expectedWorkingDirectory, Commandline actualCommand )
+    {
+        Commandline cl = new Commandline( expectedCommand );
+        if ( expectedWorkingDirectory != null )
+        {
+            cl.setWorkingDirectory( expectedWorkingDirectory.getAbsolutePath() 
);
+        }
+        System.out.println( cl.toString() );
+        System.out.println( actualCommand.toString() );
+        assertEquals( cl.toString(), actualCommand.toString() );
+    }
 }

Modified: maven/scm/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=658820&r1=658819&r2=658820&view=diff
==============================================================================
--- maven/scm/trunk/pom.xml (original)
+++ maven/scm/trunk/pom.xml Wed May 21 12:24:03 2008
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.1</version>
+      <version>1.5.1</version>
     </dependency>
   </dependencies>
   <distributionManagement>


Reply via email to