You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-dev@maven.apache.org by Emmanuel Venisse <em...@gmail.com> on 2008/05/23 23:15:15 UTC
Re: svn commit: r658820 [1/2] - in /maven/scm/trunk: ./ maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/mave
Fixed.
Emmanuel
On Thu, May 22, 2008 at 10:41 PM, Dennis Lundberg <de...@apache.org>
wrote:
> Upgrading plexus-utils requires adding a prerequisite on Maven 2.0.6.
>
>
>
> evenisse@apache.org wrote:
>
>> Author: evenisse
>> Date: Wed May 21 12:24:03 2008
>> New Revision: 658820
>>
>> URL: http://svn.apache.org/viewvc?rev=658820&view=rev
>> Log:
>> [SCM-377] upgrade plexus-utils
>>
>> Modified:
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/add/VssAddCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommandTest.java
>>
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommandTest.java
>>
>> 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
>>
>> 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
>>
>> 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
>>
>> 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
>>
>> 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
>>
>> 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
>>
>> 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
>>
>> 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
>>
>> 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
>>
>> 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
>>
>> 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
>>
>> 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
>>
>> 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
>>
>> maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
>> maven/scm/trunk/pom.xml
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -35,6 +35,6 @@
>> {
>> ScmFileSet scmFileSet = new ScmFileSet( getWorkingDirectory(), new
>> File( "test.java" ) );
>> Commandline commandLine = ClearCaseAddCommand.createCommandLine(
>> scmFileSet );
>> - assertEquals( "cleartool mkelem -c \"new file\" -nco test.java",
>> commandLine.toString() );
>> + assertCommandLine( "cleartool mkelem -c \"new file\" -nco
>> test.java", getWorkingDirectory(), commandLine );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -105,8 +105,6 @@
>> File workingDirectory = getTestFile(
>> "target/clearcare-changelog-command-test" );
>> Commandline cl = ClearCaseChangeLogCommand.createCommandLine(
>> workingDirectory, branch, startDate );
>> - System.out.println( commandLine );
>> - System.out.println( cl.toString() );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, workingDirectory, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -39,6 +39,7 @@
>> ScmFileSet scmFileSet = new ScmFileSet( getWorkingDirectory(),
>> file );
>> Commandline commandLine =
>> ClearCaseCheckInCommand.createCommandLine( scmFileSet, "done some changes"
>> );
>> - assertEquals( "cleartool ci -c \"done some changes\" " +
>> file.getAbsolutePath(), commandLine.toString() );
>> + assertCommandLine( "cleartool ci -c \"done some changes\" " +
>> file.getAbsolutePath(), getWorkingDirectory(),
>> + commandLine );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -19,9 +19,6 @@
>> * under the License.
>> */
>> -import java.io.File;
>> -import java.io.IOException;
>> -
>> import org.apache.maven.scm.ScmBranch;
>> import org.apache.maven.scm.ScmTestCase;
>> import org.apache.maven.scm.log.DefaultLog;
>> @@ -29,6 +26,9 @@
>> import org.apache.maven.scm.providers.clearcase.settings.Settings;
>> import org.codehaus.plexus.util.cli.Commandline;
>> +import java.io.File;
>> +import java.io.IOException;
>> +
>> /**
>> * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
>> * @author <a href="mailto:frederic.mura@laposte.net">Frederic Mura</a>
>> @@ -37,59 +37,62 @@
>> extends ScmTestCase
>> {
>> private Settings settings = null;
>> +
>> private ClearCaseCheckOutCommand checkOutCommand = null;
>> - - public void setUp() throws Exception +
>> + public void setUp()
>> + throws Exception
>> {
>> super.setUp();
>> checkOutCommand = new ClearCaseCheckOutCommand();
>> - checkOutCommand.setLogger(new DefaultLog());
>> + checkOutCommand.setLogger( new DefaultLog() );
>> settings = new Settings();
>> - checkOutCommand.setSettings(settings);
>> + checkOutCommand.setSettings( settings );
>> }
>> - +
>> public void testCreateViewCommandLine()
>> throws IOException
>> {
>> String viewName = "testView";
>> -
>> settings.setClearcaseType(ClearCaseScmProviderRepository.CLEARCASE_DEFAULT);
>> - - Commandline commandLine =
>> - checkOutCommand.createCreateViewCommandLine(
>> getWorkingDirectory(), viewName, null );
>> - assertEquals( "cleartool mkview -snapshot -tag testView -vws " +
>> checkOutCommand.getViewStore() +
>> - "testView.vws " + getWorkingDirectory().getCanonicalPath(),
>> commandLine.toString() );
>> + settings.setClearcaseType(
>> ClearCaseScmProviderRepository.CLEARCASE_DEFAULT );
>> - settings.setUseVWSParameter(false);
>> + Commandline commandLine =
>> checkOutCommand.createCreateViewCommandLine( getWorkingDirectory(),
>> viewName, null );
>> + assertCommandLine( "cleartool mkview -snapshot -tag testView -vws
>> " + checkOutCommand.getViewStore() +
>> + "testView.vws " + getWorkingDirectory().getCanonicalPath(),
>> getWorkingDirectory().getParentFile(),
>> +
>> commandLine );
>> +
>> + settings.setUseVWSParameter( false );
>> commandLine = checkOutCommand.createCreateViewCommandLine(
>> getWorkingDirectory(), viewName, null );
>> - assertEquals( "cleartool mkview -snapshot -tag testView " +
>> getWorkingDirectory().getCanonicalPath(),
>> - commandLine.toString() );
>> + assertCommandLine( "cleartool mkview -snapshot -tag testView " +
>> getWorkingDirectory().getCanonicalPath(),
>> + getWorkingDirectory().getParentFile(),
>> commandLine );
>> -
>> settings.setClearcaseType(ClearCaseScmProviderRepository.CLEARCASE_LT);
>> - settings.setUseVWSParameter(true);
>> + settings.setClearcaseType(
>> ClearCaseScmProviderRepository.CLEARCASE_LT );
>> + settings.setUseVWSParameter( true );
>> commandLine = checkOutCommand.createCreateViewCommandLine(
>> getWorkingDirectory(), viewName, null );
>> - assertEquals( "cleartool mkview -snapshot -tag testView " +
>> getWorkingDirectory().getCanonicalPath(),
>> - commandLine.toString() );
>> - - settings.setUseVWSParameter(false);
>> + assertCommandLine( "cleartool mkview -snapshot -tag testView " +
>> getWorkingDirectory().getCanonicalPath(),
>> + getWorkingDirectory().getParentFile(),
>> commandLine );
>> +
>> + settings.setUseVWSParameter( false );
>> commandLine = checkOutCommand.createCreateViewCommandLine(
>> getWorkingDirectory(), viewName, null );
>> - assertEquals( "cleartool mkview -snapshot -tag testView " +
>> getWorkingDirectory().getCanonicalPath(),
>> - commandLine.toString() );
>> - -
>> settings.setClearcaseType(ClearCaseScmProviderRepository.CLEARCASE_UCM);
>> + assertCommandLine( "cleartool mkview -snapshot -tag testView " +
>> getWorkingDirectory().getCanonicalPath(),
>> + getWorkingDirectory().getParentFile(),
>> commandLine );
>> +
>> + settings.setClearcaseType(
>> ClearCaseScmProviderRepository.CLEARCASE_UCM );
>> String streamId = "streamIdentifier";
>> commandLine = checkOutCommand.createCreateViewCommandLine(
>> getWorkingDirectory(), viewName, streamId );
>> - assertEquals( "cleartool mkview -snapshot -tag testView -stream "
>> + streamId + " " + - getWorkingDirectory().getCanonicalPath(),
>> commandLine.toString() );
>> - - settings.setUseVWSParameter(true);
>> + assertCommandLine( "cleartool mkview -snapshot -tag testView
>> -stream " + streamId + " " +
>> + getWorkingDirectory().getCanonicalPath(),
>> getWorkingDirectory().getParentFile(), commandLine );
>> +
>> + settings.setUseVWSParameter( true );
>> commandLine = checkOutCommand.createCreateViewCommandLine(
>> getWorkingDirectory(), viewName, streamId );
>> - assertEquals( "cleartool mkview -snapshot -tag testView -stream "
>> + streamId + " -vws " + checkOutCommand.getViewStore() +
>> - "testView.vws " + getWorkingDirectory().getCanonicalPath(),
>> commandLine.toString() );
>> + assertCommandLine( "cleartool mkview -snapshot -tag testView
>> -stream " + streamId + " -vws " +
>> + checkOutCommand.getViewStore() + "testView.vws " +
>> getWorkingDirectory().getCanonicalPath(),
>> + getWorkingDirectory().getParentFile(),
>> commandLine );
>> }
>> public void testUpdateConfigSpec()
>> {
>> -
>> settings.setClearcaseType(ClearCaseScmProviderRepository.CLEARCASE_DEFAULT);
>> + settings.setClearcaseType(
>> ClearCaseScmProviderRepository.CLEARCASE_DEFAULT );
>> File configSpecLocation;
>> if ( System.getProperty( "os.name" ).toLowerCase().indexOf(
>> "windows" ) >= 0 )
>> @@ -101,37 +104,36 @@
>> configSpecLocation = new File(
>> "/clearcase/configspecs/testconfigspec.txt" );
>> }
>> - Commandline commandLine =
>> checkOutCommand.createUpdateConfigSpecCommandLine( getWorkingDirectory(),
>> -
>> configSpecLocation,
>> -
>> "testView" );
>> - assertEquals( "cleartool setcs -tag testView " +
>> configSpecLocation, commandLine.toString() );
>> -
>> -
>> settings.setClearcaseType(ClearCaseScmProviderRepository.CLEARCASE_LT);
>> - commandLine = checkOutCommand.createUpdateConfigSpecCommandLine(
>> getWorkingDirectory(),
>> -
>> configSpecLocation, "testView" );
>> - assertEquals( "cleartool setcs -tag testView " +
>> configSpecLocation, commandLine.toString() );
>> + Commandline commandLine =
>> + checkOutCommand.createUpdateConfigSpecCommandLine(
>> getWorkingDirectory(), configSpecLocation, "testView" );
>> + assertCommandLine( "cleartool setcs -tag testView " +
>> configSpecLocation, getWorkingDirectory(), commandLine );
>> +
>> + settings.setClearcaseType(
>> ClearCaseScmProviderRepository.CLEARCASE_LT );
>> + commandLine =
>> + checkOutCommand.createUpdateConfigSpecCommandLine(
>> getWorkingDirectory(), configSpecLocation, "testView" );
>> + assertCommandLine( "cleartool setcs -tag testView " +
>> configSpecLocation, getWorkingDirectory(), commandLine );
>> }
>> public void testCreateConfigSpec()
>> {
>> assertEquals( "element * CHECKEDOUT\n" + "element *
>> /main/LATEST\n" + "load MYVOB/my/dir\n",
>> - checkOutCommand.createConfigSpec( "MYVOB/my/dir", null )
>> );
>> + checkOutCommand.createConfigSpec( "MYVOB/my/dir",
>> null ) );
>> assertEquals( "element * CHECKEDOUT\n" + "element * MYTAG\n" +
>> "element -directory * /main/LATEST\n" +
>> "load MYVOB/my/dir\n", checkOutCommand
>> .createConfigSpec( "MYVOB/my/dir", new ScmBranch( "MYTAG" ) )
>> );
>> }
>> - +
>> public void testGetStreamIdentifier()
>> {
>> String streamName = "stream35_v1.0";
>> String vobName = "pVob_35";
>> - String streamIdentifier =
>> checkOutCommand.getStreamIdentifier(streamName, vobName);
>> - assertEquals("stream:" + streamName + "@" + vobName,
>> streamIdentifier);
>> - - streamIdentifier =
>> checkOutCommand.getStreamIdentifier(streamName, null);
>> - assertNull(streamIdentifier);
>> - - streamIdentifier =
>> checkOutCommand.getStreamIdentifier(null, vobName);
>> - assertNull(streamIdentifier);
>> + String streamIdentifier = checkOutCommand.getStreamIdentifier(
>> streamName, vobName );
>> + assertEquals( "stream:" + streamName + "@" + vobName,
>> streamIdentifier );
>> +
>> + streamIdentifier = checkOutCommand.getStreamIdentifier(
>> streamName, null );
>> + assertNull( streamIdentifier );
>> +
>> + streamIdentifier = checkOutCommand.getStreamIdentifier( null,
>> vobName );
>> + assertNull( streamIdentifier );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -37,6 +37,6 @@
>> File file = new File( "test.java" );
>> ScmFileSet scmFileSet = new ScmFileSet( getWorkingDirectory(),
>> file );
>> Commandline commandLine = ClearCaseEditCommand.createCommandLine(
>> new DefaultLog(), scmFileSet );
>> - assertEquals( "cleartool co -nc " + file.getAbsolutePath(),
>> commandLine.toString() );
>> + assertCommandLine( "cleartool co -nc " + file.getAbsolutePath(),
>> getWorkingDirectory(), commandLine );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -36,6 +36,6 @@
>> {
>> ScmFileSet scmFileSet = new ScmFileSet( getWorkingDirectory(), new
>> File( "test.java" ) );
>> Commandline commandLine =
>> ClearCaseRemoveCommand.createCommandLine( new DefaultLog(), scmFileSet );
>> - assertEquals( "cleartool rmname -nc test.java",
>> commandLine.toString() );
>> + assertCommandLine( "cleartool rmname -nc test.java",
>> getWorkingDirectory(), commandLine );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -35,6 +35,6 @@
>> {
>> ScmFileSet scmFileSet = new ScmFileSet( getWorkingDirectory(), new
>> File( "test.java" ) );
>> Commandline commandLine =
>> ClearCaseStatusCommand.createCommandLine( scmFileSet );
>> - assertEquals( "cleartool lscheckout -cview -r -fmt %n\\n",
>> commandLine.toString() );
>> + assertCommandLine( "cleartool lscheckout -cview -r -fmt %n\\n",
>> getWorkingDirectory(), commandLine );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -35,6 +35,6 @@
>> {
>> ScmFileSet scmFileSet = new ScmFileSet( getWorkingDirectory(), new
>> File( "test.java" ) );
>> Commandline commandLine = ClearCaseTagCommand.createCommandLine(
>> scmFileSet, "TEST_LABEL_V1.0" );
>> - assertEquals( "cleartool mklabel TEST_LABEL_V1.0 test.java",
>> commandLine.toString() );
>> + assertCommandLine( "cleartool mklabel TEST_LABEL_V1.0 test.java",
>> getWorkingDirectory(), commandLine );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -36,6 +36,6 @@
>> {
>> ScmFileSet scmFileSet = new ScmFileSet( getWorkingDirectory(), new
>> File( "test.java" ) );
>> Commandline commandLine =
>> ClearCaseUnEditCommand.createCommandLine( new DefaultLog(), scmFileSet );
>> - assertEquals( "cleartool unco -keep test.java",
>> commandLine.toString() );
>> + assertCommandLine( "cleartool unco -keep test.java",
>> getWorkingDirectory(), commandLine );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -33,6 +33,6 @@
>> {
>> ScmFileSet scmFileSet = new ScmFileSet( getWorkingDirectory() );
>> Commandline commandLine =
>> ClearCaseUpdateCommand.createCommandLine( scmFileSet );
>> - assertEquals( "cleartool update -f", commandLine.toString() );
>> + assertCommandLine( "cleartool update -f", getWorkingDirectory(),
>> commandLine );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -35,8 +35,9 @@
>> public class PerforceAddCommandTest
>> extends ScmTestCase
>> {
>> - +
>> private static final File workingDirectory = getTestFile(
>> "target/perforce-add-command-test" );
>> +
>> private static final String cmdPrefix = "p4 -d " +
>> workingDirectory.getAbsolutePath();
>> public void testGetCommandLine()
>> @@ -72,6 +73,6 @@
>> ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
>> File( "foo.xml" ), new File( "bar.xml" )} );
>> Commandline cl = PerforceAddCommand.createCommandLine(
>> svnRepository, workingDirectory, files );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -36,6 +36,7 @@
>> extends ScmTestCase
>> {
>> private static final File workingDirectory = getTestFile(
>> "target/perforce-changelog-command-test" );
>> +
>> private static final String cmdPrefix = "p4 -d " +
>> workingDirectory.getAbsolutePath();
>> public void testGetCommandLine()
>> @@ -47,7 +48,8 @@
>> public void testGetCommandLineWithHost()
>> throws Exception
>> {
>> - testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
>> cmdPrefix + " -p a -u username filelog -t -l ..." );
>> + testCommandLine( "scm:perforce:a:username@
>> //depot/projects/pathname",
>> + cmdPrefix + " -p a -u username filelog -t -l
>> ..." );
>> }
>> public void testGetCommandLineWithHostAndPort()
>> @@ -72,6 +74,6 @@
>> Commandline cl = PerforceChangeLogCommand.createCommandLine( repo,
>> workingDirectory, System.getProperty(
>> PerforceScmProvider.DEFAULT_CLIENTSPEC_PROPERTY ) );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -70,7 +70,7 @@
>> ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
>> File( "foo.xml" ), new File( "bar.xml" )} );
>> Commandline cl = PerforceCheckInCommand.createCommandLine(
>> svnRepository, workingDirectory );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> String change =
>> PerforceCheckInCommand.createChangeListSpecification( svnRepository, files,
>> "Test checkin",
>>
>> "//depot/projects/pathname", "testjob" );
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -37,12 +37,14 @@
>> extends ScmTestCase
>> {
>> private static final File workingDirectory = getTestFile(
>> "target/perforce-checkout-command-test" );
>> +
>> private static final String cmdPrefix = "p4 -d " +
>> workingDirectory.getAbsolutePath();
>> public void testGetCommandLine()
>> throws Exception
>> {
>> - testCommandLine( "scm:perforce://depot/projects/pathname",
>> cmdPrefix + " -ctest-test-maven sync -f @somelabel" );
>> + testCommandLine( "scm:perforce://depot/projects/pathname",
>> + cmdPrefix + " -ctest-test-maven sync -f
>> @somelabel" );
>> }
>> public void testGetCommandLineWithHost()
>> @@ -81,6 +83,6 @@
>> Commandline cl = PerforceCheckOutCommand.createCommandLine(
>> svnRepository, workingDirectory,
>> new
>> ScmRevision( "somelabel" ), "test-test-maven" );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -64,6 +64,6 @@
>> .getProviderRepository();
>> Commandline cl = PerforceDiffCommand.createCommandLine(
>> svnRepository, workingDirectory, startRev, endRev );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -36,6 +36,7 @@
>> extends ScmTestCase
>> {
>> private static final File workingDir = new File( "." );
>> +
>> private static final String cmdPrefix = "p4 -d " +
>> workingDir.getAbsolutePath();
>> public void testGetCommandLine()
>> @@ -59,6 +60,6 @@
>> ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
>> File( "foo.xml" ), new File( "bar.xml" )} );
>> Commandline cl = PerforceEditCommand.createCommandLine(
>> svnRepository, workingDir, files );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -19,7 +19,6 @@
>> * under the License.
>> */
>> -import org.apache.maven.scm.CommandParameters;
>> import org.apache.maven.scm.ScmTestCase;
>> import
>> org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
>> import org.apache.maven.scm.repository.ScmRepository;
>> @@ -36,6 +35,7 @@
>> extends ScmTestCase
>> {
>> private static final File workingDirectory = getTestFile(
>> "target/perforce-login-command-test" );
>> +
>> private static final String cmdPrefix = "p4 -d " +
>> workingDirectory.getAbsolutePath();
>> public void testGetCommandLine()
>> @@ -57,6 +57,6 @@
>> //CommandParameters params = new CommandParameters();
>> Commandline cl = PerforceLoginCommand.createCommandLine(
>> svnRepository, workingDirectory );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -36,6 +36,7 @@
>> extends ScmTestCase
>> {
>> private static final File workingDirectory = getTestFile(
>> "target/perforce-remove-command-test" );
>> +
>> private static final String cmdPrefix = "p4 -d " +
>> workingDirectory.getAbsolutePath();
>> public void testGetCommandLine()
>> @@ -71,6 +72,6 @@
>> ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
>> File( "foo.xml" ), new File( "bar.xml" )} );
>> Commandline cl = PerforceRemoveCommand.createCommandLine(
>> svnRepository, workingDirectory, files );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -36,6 +36,7 @@
>> extends ScmTestCase
>> {
>> private static final File workingDirectory = getTestFile(
>> "target/perforce-tag-command-test" );
>> +
>> private static final String cmdPrefix = "p4 -d " +
>> workingDirectory.getAbsolutePath();
>> public void testCreateCommandLine()
>> @@ -48,16 +49,16 @@
>> //
>> //
>> ----------------------------------------------------------------------
>> - private void testCommandLine( String expected )
>> + private void testCommandLine( String commandLine )
>> throws Exception
>> {
>> - ScmRepository repository =
>> getScmManager().makeScmRepository( "scm:perforce://depot/projects/pathname"
>> );
>> PerforceScmProviderRepository svnRepository =
>> (PerforceScmProviderRepository) repository
>> .getProviderRepository();
>> - Commandline cl1 = PerforceStatusCommand.createOpenedCommandLine(
>> svnRepository, workingDirectory,
>> -
>> "//depot/projects/pathname" );
>> - assertEquals( expected, cl1.toString() );
>> + Commandline cl = PerforceStatusCommand.createOpenedCommandLine(
>> svnRepository, workingDirectory,
>> +
>> "//depot/projects/pathname" );
>> +
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -37,6 +37,7 @@
>> extends ScmTestCase
>> {
>> private static final File workingDirectory = getTestFile(
>> "target/perforce-tag-command-test" );
>> +
>> private static final String cmdPrefix = "p4 -d " +
>> workingDirectory.getAbsolutePath();
>> public void testCreateCommandLine()
>> @@ -58,8 +59,9 @@
>> ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
>> File( "foo.xml" ), new File( "bar.xml" )} );
>> Commandline cl1 = PerforceTagCommand.createLabelCommandLine(
>> svnRepository, workingDirectory );
>> - assertEquals( create, cl1.toString() );
>> + assertCommandLine( create, null, cl1 );
>> +
>> Commandline cl2 = PerforceTagCommand.createLabelsyncCommandLine(
>> svnRepository, workingDirectory, files, tag );
>> - assertEquals( sync, cl2.toString() );
>> + assertCommandLine( sync, null, cl2 );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -36,6 +36,7 @@
>> extends ScmTestCase
>> {
>> private static final File workingDirectory = getTestFile(
>> "target/perforce-unedit-command-test" );
>> +
>> private static final String cmdPrefix = "p4 -d " +
>> workingDirectory.getAbsolutePath();
>> public void testGetCommandLine()
>> @@ -57,6 +58,6 @@
>> ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
>> File( "foo.xml" ), new File( "bar.xml" )} );
>> Commandline cl = PerforceUnEditCommand.createCommandLine(
>> svnRepository, workingDirectory, files );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -102,6 +102,6 @@
>> Commandline cl = StarteamAddCommand.createCommandLine(
>> repository, fileSet, crPath );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -64,6 +64,6 @@
>> Commandline cl = StarteamChangeLogCommand.createCommandLine(
>> svnRepository, workingCopy, null );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -138,7 +138,7 @@
>> Commandline cl =
>> StarteamCheckInCommand.createCommandLine( repository, fileSet,
>> message, version, issueType, issueValue );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -64,7 +64,7 @@
>> Commandline cl = StarteamCheckOutCommand.createCommandLine(
>> repository, workingCopy, version );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -87,7 +87,7 @@
>> Commandline cl = StarteamDiffCommand.createCommandLine(
>> repository, basedir, startLabel, endLabel );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -83,6 +83,6 @@
>> Commandline cl = StarteamEditCommand.createCommandLine(
>> repository, fileSet );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -81,6 +81,6 @@
>> Commandline cl = StarteamRemoveCommand.createCommandLine(
>> repository, fileSet );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -64,7 +64,7 @@
>> Commandline cl = StarteamStatusCommand.createCommandLine(
>> repository, workDir );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -57,6 +57,6 @@
>> Commandline cl = StarteamTagCommand.createCommandLine(
>> repository, workDir, tag );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -82,6 +82,6 @@
>> Commandline cl = StarteamUnEditCommand.createCommandLine(
>> repository, fileName );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommandTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommandTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommandTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommandTest.java
>> Wed May 21 12:24:03 2008
>> @@ -104,6 +104,6 @@
>> System.out.println( cl );
>> - assertEquals( commandLine, cl.toString() );
>> + assertCommandLine( commandLine, null, cl );
>> }
>> }
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
>> URL:
>> http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java?rev=658820&r1=658819&r2=658820&view=diff
>>
>> ==============================================================================
>> ---
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
>> (original)
>> +++
>> maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
>> Wed May 21 12:24:03 2008
>> @@ -19,9 +19,9 @@
>> * under the License.
>> */
>> -import junit.framework.TestCase;
>> import org.apache.maven.scm.ScmException;
>> import org.apache.maven.scm.ScmTag;
>> +import org.apache.maven.scm.ScmTestCase;
>> import org.codehaus.plexus.util.cli.Commandline;
>> import java.io.File;
>> @@ -32,37 +32,37 @@
>> * @author <a href="mailto:julien.henry@capgemini.com">Julien Henry</a>
>> */
>> public class SynergyCCMTest
>> - extends TestCase
>> + extends ScmTestCase
>> {
>> public void testShowTaskObjects()
>> - throws ScmException
>> + throws Exception
>> {
>> Commandline cl = SynergyCCM.showTaskObjects( 45, "my format",
>> "CCM_ADDR" );
>> - assertTrue( "CCM_ADDR is not set.", assertContains(
>> cl.getEnvironments(), "CCM_ADDR=CCM_ADDR" ) );
>> - assertEquals( "ccm task -show objects -f \"my format\" 45",
>> cl.toString() );
>> + assertTrue( "CCM_ADDR is not set.", assertContains(
>> cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
>> + assertCommandLine( "ccm task -show objects -f \"my format\" 45",
>> null, cl );
>> cl = SynergyCCM.showTaskObjects( 45, null, "CCM_ADDR" );
>> - assertEquals( "ccm task -show objects 45", cl.toString() );
>> + assertCommandLine( "ccm task -show objects 45", null, cl );
>> }
>> public void testQuery()
>> - throws ScmException
>> + throws Exception
>> {
>> Commandline cl = SynergyCCM.query( "my query", "my format",
>> "CCM_ADDR" );
>> - assertTrue( "CCM_ADDR is not set.", assertContains(
>> cl.getEnvironments(), "CCM_ADDR=CCM_ADDR" ) );
>> - assertEquals( "ccm query -u -f \"my format\" \"my query\"",
>> cl.toString() );
>> + assertTrue( "CCM_ADDR is not set.", assertContains(
>> cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
>> + assertCommandLine( "ccm query -u -f \"my format\" \"my query\"",
>> null, cl );
>> cl = SynergyCCM.query( "my query", null, "CCM_ADDR" );
>> - assertEquals( "ccm query -u \"my query\"", cl.toString() );
>> + assertCommandLine( "ccm query -u \"my query\"", null, cl );
>> }
>> public void testCreateBaseline()
>> - throws ScmException
>> + throws Exception
>> {
>> Commandline cl =
>> SynergyCCM.createBaseline( "myProject~1", "theBaseline",
>> "my_release", "my_purpose", "CCM_ADDR" );
>> - assertTrue( "CCM_ADDR is not set.", assertContains(
>> cl.getEnvironments(), "CCM_ADDR=CCM_ADDR" ) );
>> - assertEquals( "ccm baseline -create theBaseline -p myProject~1
>> -release my_release -purpose my_purpose",
>> - cl.toString() );
>> + assertTrue( "CCM_ADDR is not set.", assertContains(
>> cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
>> + assertCommandLine( "ccm baseline -create theBaseline -p
>> myProject~1 -release my_release -purpose my_purpose",
>> + null, cl );
>> }
>> public void testCreate()
>> @@ -73,14 +73,14 @@
>> List list = new LinkedList();
>> list.add( f );
>> Commandline cl = SynergyCCM.create( list, "test creation",
>> "CCM_ADDR" );
>> - assertTrue( "CCM_ADDR is not set.", assertContains(
>> cl.getEnvironments(), "CCM_ADDR=CCM_ADDR" ) );
>> + assertTrue( "CCM_ADDR is not set.", assertContains(
>> cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
>> if ( f.getCanonicalPath().indexOf( " " ) > -1 )
>> {
>> - assertEquals( "ccm create -c \"test creation\" \"" +
>> f.getCanonicalPath() + "\"", cl.toString() );
>> + assertCommandLine( "ccm create -c \"test creation\" \"" +
>> f.getCanonicalPath() + "\"", null, cl );
>> }
>> else
>> {
>> - assertEquals( "ccm create -c \"test creation\" " +
>> f.getCanonicalPath(), cl.toString() );
>> + assertCommandLine( "ccm create -c \"test creation\" " +
>> f.getCanonicalPath(), null, cl );
>> }
>> File f2 = File.createTempFile( "test", null );
>> f2.deleteOnExit();
>> @@ -90,52 +90,52 @@
>> {
>> if ( f2.getCanonicalPath().indexOf( " " ) > -1 )
>> {
>> - assertEquals( "ccm create -c \"test creation\" \"" +
>> f.getCanonicalPath() + "\" \"" +
>> - f2.getCanonicalPath() + "\"", cl.toString() );
>> + assertCommandLine( "ccm create -c \"test creation\" \"" +
>> f.getCanonicalPath() + "\" \"" +
>> + f2.getCanonicalPath() + "\"", null, cl );
>> }
>> else
>> {
>> - assertEquals(
>> + assertCommandLine(
>> "ccm create -c \"test creation\" \""
>
> ...
>
> [Message clipped]