Author: pschneider
Date: Mon Apr 30 14:09:04 2007
New Revision: 533858
URL: http://svn.apache.org/viewvc?view=rev&rev=533858
Log:
PR: SCM-209
Use -d flag instead of setWorkingDirectory. Fix new expected command line
string in unit tests.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.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
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
Mon Apr 30 14:09:04 2007
@@ -254,12 +254,10 @@
command.setExecutable( "p4" );
if ( workingDir != null )
{
- command.setWorkingDirectory( workingDir.getAbsolutePath() );
+ // SCM-209
+ command.createArgument().setValue( "-d" );
+ command.createArgument().setValue( workingDir.getAbsolutePath() );
}
-
- // SCM-209
-// command.createArgument().setValue("-d");
-// command.createArgument().setValue(workingDir.getAbsolutePath());
if ( repo.getHost() != null )
{
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?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
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
Mon Apr 30 14:09:04 2007
@@ -35,24 +35,28 @@
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()
throws Exception
{
- testCommandLine( "scm:perforce://depot/projects/pathname", "p4 add
foo.xml bar.xml" );
+ testCommandLine( "scm:perforce://depot/projects/pathname", cmdPrefix +
" add foo.xml bar.xml" );
}
public void testGetCommandLineWithHost()
throws Exception
{
testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
- "p4 -p a -u username add foo.xml bar.xml" );
+ cmdPrefix + " -p a -u username add foo.xml bar.xml" );
}
public void testGetCommandLineWithHostAndPort()
throws Exception
{
testCommandLine(
"scm:perforce:myhost:1234:username@//depot/projects/pathname",
- "p4 -p myhost:1234 -u username add foo.xml bar.xml" );
+ cmdPrefix + " -p myhost:1234 -u username add foo.xml
bar.xml" );
}
// ----------------------------------------------------------------------
@@ -62,8 +66,6 @@
private void testCommandLine( String scmUrl, String commandLine )
throws Exception
{
- File workingDirectory = getTestFile(
"target/perforce-add-command-test" );
-
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository.getProviderRepository();
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?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
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
Mon Apr 30 14:09:04 2007
@@ -35,16 +35,19 @@
public class PerforceChangeLogCommandTest
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()
throws Exception
{
- testCommandLine( "scm:perforce://depot/projects/pathname", "p4 filelog
-t -l ..." );
+ testCommandLine( "scm:perforce://depot/projects/pathname", cmdPrefix +
" filelog -t -l ..." );
}
public void testGetCommandLineWithHost()
throws Exception
{
- testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
"p4 -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()
@@ -52,7 +55,7 @@
{
System.setProperty( PerforceScmProvider.DEFAULT_CLIENTSPEC_PROPERTY,
"foo" );
testCommandLine(
"scm:perforce:myhost:1234:username@//depot/projects/pathname",
- "p4 -p myhost:1234 -u username -c foo filelog -t -l
..." );
+ cmdPrefix + " -p myhost:1234 -u username -c foo
filelog -t -l ..." );
}
// ----------------------------------------------------------------------
@@ -62,8 +65,6 @@
private void testCommandLine( String scmUrl, String commandLine )
throws Exception
{
- File workingDirectory = getTestFile(
"target/perforce-changelog-command-test" );
-
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository repo = (PerforceScmProviderRepository)
repository.getProviderRepository();
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?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
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
Mon Apr 30 14:09:04 2007
@@ -35,23 +35,26 @@
public class PerforceCheckInCommandTest
extends ScmTestCase
{
+ private static final File workingDirectory = getTestFile(
"target/perforce-checkin-command-test" );
+ private static final String cmdPrefix = "p4 -d " +
workingDirectory.getAbsolutePath();
+
public void testGetCommandLine()
throws Exception
{
- testCommandLine( "scm:perforce://depot/projects/pathname", "p4 submit
-i" );
+ testCommandLine( "scm:perforce://depot/projects/pathname", cmdPrefix +
" submit -i" );
}
public void testGetCommandLineWithHost()
throws Exception
{
- testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
"p4 -p a -u username submit -i" );
+ testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
cmdPrefix + " -p a -u username submit -i" );
}
public void testGetCommandLineWithHostAndPort()
throws Exception
{
testCommandLine(
"scm:perforce:myhost:1234:username@//depot/projects/pathname",
- "p4 -p myhost:1234 -u username submit -i" );
+ cmdPrefix + " -p myhost:1234 -u username submit -i" );
}
// ----------------------------------------------------------------------
@@ -61,8 +64,6 @@
private void testCommandLine( String scmUrl, String commandLine )
throws Exception
{
- File workingDirectory = getTestFile(
"target/perforce-checkin-command-test" );
-
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository.getProviderRepository();
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?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
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
Mon Apr 30 14:09:04 2007
@@ -36,24 +36,27 @@
public class PerforceCheckOutCommandTest
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", "p4
-ctest-test-maven sync -f @somelabel" );
+ testCommandLine( "scm:perforce://depot/projects/pathname", cmdPrefix +
" -ctest-test-maven sync -f @somelabel" );
}
public void testGetCommandLineWithHost()
throws Exception
{
testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
- "p4 -p a -u username -ctest-test-maven sync -f
@somelabel" );
+ cmdPrefix + " -p a -u username -ctest-test-maven sync
-f @somelabel" );
}
public void testGetCommandLineWithHostAndPort()
throws Exception
{
testCommandLine(
"scm:perforce:myhost:1234:username@//depot/projects/pathname",
- "p4 -p myhost:1234 -u username -ctest-test-maven sync
-f @somelabel" );
+ cmdPrefix + " -p myhost:1234 -u username
-ctest-test-maven sync -f @somelabel" );
}
public void testClean()
@@ -70,7 +73,6 @@
private void testCommandLine( String scmUrl, String commandLine )
throws Exception
{
- File workingDirectory = getTestFile(
"target/perforce-checkout-command-test" );
workingDirectory.mkdirs();
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
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?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
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
Mon Apr 30 14:09:04 2007
@@ -36,17 +36,20 @@
public class PerforceDiffCommandTest
extends ScmTestCase
{
+ private static final File workingDirectory = getTestFile(
"target/perforce-diff-command-test" );
+ private static final String cmdPrefix = "p4 -d " +
workingDirectory.getAbsolutePath();
+
public void testGetCommandLine()
throws Exception
{
- testCommandLine( new ScmRevision( "somelabel" ), null, "p4 diff2 -u
[EMAIL PROTECTED] [EMAIL PROTECTED]" );
+ testCommandLine( new ScmRevision( "somelabel" ), null, cmdPrefix + "
diff2 -u [EMAIL PROTECTED] [EMAIL PROTECTED]" );
}
public void testGetCommandLineWithRevs()
throws Exception
{
testCommandLine( new ScmRevision( "somelabel" ), new ScmRevision(
"someend" ),
- "p4 diff2 -u [EMAIL PROTECTED] [EMAIL PROTECTED]" );
+ cmdPrefix + " diff2 -u [EMAIL PROTECTED] [EMAIL
PROTECTED]" );
}
// ----------------------------------------------------------------------
@@ -56,8 +59,6 @@
private void testCommandLine( ScmVersion startRev, ScmVersion endRev,
String commandLine )
throws Exception
{
- File workingDirectory = getTestFile(
"target/perforce-diff-command-test" );
-
ScmRepository repository = getScmManager().makeScmRepository(
"scm:perforce://depot/projects/pathname" );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository
.getProviderRepository();
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?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
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
Mon Apr 30 14:09:04 2007
@@ -35,10 +35,13 @@
public class PerforceEditCommandTest
extends ScmTestCase
{
+ private static final File workingDir = new File( "." );
+ private static final String cmdPrefix = "p4 -d " +
workingDir.getAbsolutePath();
+
public void testGetCommandLine()
throws Exception
{
- testCommandLine( "scm:perforce://depot/projects/pathname", "p4 edit
foo.xml bar.xml" );
+ testCommandLine( "scm:perforce://depot/projects/pathname", cmdPrefix +
" edit foo.xml bar.xml" );
}
// ----------------------------------------------------------------------
@@ -54,7 +57,7 @@
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository
.getProviderRepository();
ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
File( "foo.xml" ), new File( "bar.xml" )} );
- Commandline cl = PerforceEditCommand.createCommandLine( svnRepository,
new File( "." ), files );
+ Commandline cl = PerforceEditCommand.createCommandLine( svnRepository,
workingDir, files );
assertEquals( commandLine, cl.toString() );
}
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?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
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
Mon Apr 30 14:09:04 2007
@@ -35,10 +35,13 @@
public class PerforceLoginCommandTest
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()
throws Exception
{
- testCommandLine( "p4 login" );
+ testCommandLine( cmdPrefix + " login" );
}
// ----------------------------------------------------------------------
@@ -48,12 +51,10 @@
private void testCommandLine( String commandLine )
throws Exception
{
- File workingDirectory = getTestFile(
"target/perforce-login-command-test" );
-
ScmRepository repository = getScmManager().makeScmRepository(
"scm:perforce://depot/projects/pathname" );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository
.getProviderRepository();
- CommandParameters params = new CommandParameters();
+ //CommandParameters params = new CommandParameters();
Commandline cl = PerforceLoginCommand.createCommandLine(
svnRepository, workingDirectory );
assertEquals( commandLine, cl.toString() );
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?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
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
Mon Apr 30 14:09:04 2007
@@ -35,24 +35,27 @@
public class PerforceRemoveCommandTest
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()
throws Exception
{
- testCommandLine( "scm:perforce://depot/projects/pathname", "p4 delete
foo.xml bar.xml" );
+ testCommandLine( "scm:perforce://depot/projects/pathname", cmdPrefix +
" delete foo.xml bar.xml" );
}
public void testGetCommandLineWithHost()
throws Exception
{
testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
- "p4 -p a -u username delete foo.xml bar.xml" );
+ cmdPrefix + " -p a -u username delete foo.xml
bar.xml" );
}
public void testGetCommandLineWithHostAndPort()
throws Exception
{
testCommandLine(
"scm:perforce:myhost:1234:username@//depot/projects/pathname",
- "p4 -p myhost:1234 -u username delete foo.xml
bar.xml" );
+ cmdPrefix + " -p myhost:1234 -u username delete
foo.xml bar.xml" );
}
// ----------------------------------------------------------------------
@@ -62,8 +65,6 @@
private void testCommandLine( String scmUrl, String commandLine )
throws Exception
{
- File workingDirectory = getTestFile(
"target/perforce-remove-command-test" );
-
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository.getProviderRepository();
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?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
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
Mon Apr 30 14:09:04 2007
@@ -35,10 +35,13 @@
public class PerforceStatusCommandTest
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()
throws Exception
{
- testCommandLine( "p4 opened //depot/projects/pathname/..." );
+ testCommandLine( cmdPrefix + " opened //depot/projects/pathname/..." );
}
// ----------------------------------------------------------------------
@@ -48,7 +51,7 @@
private void testCommandLine( String expected )
throws Exception
{
- File workingDirectory = getTestFile(
"target/perforce-tag-command-test" );
+
ScmRepository repository = getScmManager().makeScmRepository(
"scm:perforce://depot/projects/pathname" );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository
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?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
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
Mon Apr 30 14:09:04 2007
@@ -36,10 +36,13 @@
public class PerforceTagCommandTest
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()
throws Exception
{
- testCommandLine( "foo-tag", "p4 label -i", "p4 labelsync -l foo-tag
foo.xml bar.xml" );
+ testCommandLine( "foo-tag", cmdPrefix + " label -i", cmdPrefix + "
labelsync -l foo-tag foo.xml bar.xml" );
}
// ----------------------------------------------------------------------
@@ -49,8 +52,6 @@
private void testCommandLine( String tag, String create, String sync )
throws Exception
{
- File workingDirectory = getTestFile(
"target/perforce-tag-command-test" );
-
ScmRepository repository = getScmManager().makeScmRepository(
"scm:perforce://depot/projects/pathname" );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository
.getProviderRepository();
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?view=diff&rev=533858&r1=533857&r2=533858
==============================================================================
---
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
Mon Apr 30 14:09:04 2007
@@ -35,10 +35,13 @@
public class PerforceUnEditCommandTest
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()
throws Exception
{
- testCommandLine( "scm:perforce://depot/projects/pathname", "p4 revert
foo.xml bar.xml" );
+ testCommandLine( "scm:perforce://depot/projects/pathname", cmdPrefix +
" revert foo.xml bar.xml" );
}
// ----------------------------------------------------------------------
@@ -48,8 +51,6 @@
private void testCommandLine( String scmUrl, String commandLine )
throws Exception
{
- File workingDirectory = getTestFile(
"target/perforce-unedit-command-test" );
-
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository.getProviderRepository();
