You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by br...@apache.org on 2005/01/03 04:22:59 UTC
cvs commit: maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/update CvsUpdateCommandTckTest.java
brett 2005/01/02 19:22:59
Modified: maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin
CheckInCommandTckTest.java
maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout
CheckOutCommandTckTest.java
maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/update
CvsUpdateCommandTckTest.java
Log:
some clean up
Revision Changes Path
1.3 +7 -3 maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
Index: CheckInCommandTckTest.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CheckInCommandTckTest.java 3 Jan 2005 03:19:56 -0000 1.2
+++ CheckInCommandTckTest.java 3 Jan 2005 03:22:59 -0000 1.3
@@ -86,6 +86,11 @@
return PlexusTestCase.getTestFile( "target/scm-test/working-copy" );
}
+ protected File getAssertionCopy()
+ {
+ return PlexusTestCase.getTestFile( "target/scm-test/assertion-copy" );
+ }
+
protected void setUp()
throws Exception
{
@@ -111,8 +116,7 @@
assertTrue( "Could not make the working directory: " + workingDirectory.getAbsolutePath(),
workingDirectory.mkdirs() );
- // TODO: have assertion directory globally, and cleanup -tck-test stuff
- assertionDirectory = getTestFile( "target/checkin-tck-test/assertion-copy" );
+ assertionDirectory = getAssertionCopy();
if ( assertionDirectory.exists() )
{
1.5 +3 -3 maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java
Index: CheckOutCommandTckTest.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CheckOutCommandTckTest.java 2 Jan 2005 03:05:13 -0000 1.4
+++ CheckOutCommandTckTest.java 3 Jan 2005 03:22:59 -0000 1.5
@@ -87,7 +87,7 @@
{
super.setUp();
- File repositoryRoot = getTestFile( "target/checkout-tck-test/repository" );
+ File repositoryRoot = getRepositoryRoot();
if ( repositoryRoot.exists() )
{
@@ -96,7 +96,7 @@
assertTrue( "Could not make the repository root directory: " + repositoryRoot.getAbsolutePath(), repositoryRoot.mkdirs() );
- workingDirectory = getTestFile( "target/checkout-tck-test/working-copy" );
+ workingDirectory = getWorkingCopy();
if ( workingDirectory.exists() )
{
1.3 +1 -2 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommandTckTest.java
Index: CvsUpdateCommandTckTest.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommandTckTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsUpdateCommandTckTest.java 3 Jan 2005 00:49:03 -0000 1.2
+++ CvsUpdateCommandTckTest.java 3 Jan 2005 03:22:59 -0000 1.3
@@ -39,7 +39,6 @@
public void initRepo()
throws Exception
{
- // TODO: should have an assertion directory?
CvsScmTestUtils.initRepo( "src/test/tck-repository/", getRepositoryRoot(), getWorkingDirectory() );
}
}