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/02 04:05:13 UTC
cvs commit: maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update UpdateCommandTckTest.java
brett 2005/01/01 19:05:13
Modified: maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkout
CvsCheckoutCommandTest.java
maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/update
CvsUpdateCommandTest.java
maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout
LocalCheckoutCommandTest.java
maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout
CheckOutCommandTckTest.java
maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update
UpdateCommandTckTest.java
Log:
add some todo annotations for SCM-17
Revision Changes Path
1.8 +3 -1 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java
Index: CvsCheckoutCommandTest.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CvsCheckoutCommandTest.java 30 Dec 2004 03:39:52 -0000 1.7
+++ CvsCheckoutCommandTest.java 2 Jan 2005 03:05:13 -0000 1.8
@@ -38,6 +38,7 @@
return "test-repo/checkout";
}
+ /** @todo move this test to the TCK. */
public void testCheckOutWithoutTag()
throws Exception
{
@@ -63,6 +64,7 @@
assertCheckedOutFile( files, 2, "/src/java/org/apache/maven/MavenUtils.java", ScmFileStatus.UPDATED );
}
+ /** @todo move this test to the TCK - checkout with "revision", then have one for tag as well. */
public void testCheckOutWithTag()
throws Exception
{
1.9 +2 -1 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommandTest.java
Index: CvsUpdateCommandTest.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/CvsUpdateCommandTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CvsUpdateCommandTest.java 30 Dec 2004 03:39:52 -0000 1.8
+++ CvsUpdateCommandTest.java 2 Jan 2005 03:05:13 -0000 1.9
@@ -62,6 +62,7 @@
return "test-repo/update";
}
+ /** @todo merge into tck */
public void testCvsUpdate()
throws Exception
{
1.8 +3 -1 maven-scm/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckoutCommandTest.java
Index: LocalCheckoutCommandTest.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckoutCommandTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LocalCheckoutCommandTest.java 24 Dec 2004 03:24:38 -0000 1.7
+++ LocalCheckoutCommandTest.java 2 Jan 2005 03:05:13 -0000 1.8
@@ -37,6 +37,7 @@
public class LocalCheckoutCommandTest
extends AbstractLocalScmTest
{
+ /** @todo thought tag was not supported? if so, merge with tck. */
public void testCheckOutWithTag()
throws Exception
{
@@ -66,6 +67,7 @@
coTest( "scm:local|" + getTestPath( "src/test/repository" ) + "|test-repo" );
}
+ /** @todo is this any different from what is in TCK? */
private void coTest( String scmUrl )
throws Exception
{
1.4 +13 -21 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CheckOutCommandTckTest.java 24 Dec 2004 03:04:48 -0000 1.3
+++ CheckOutCommandTckTest.java 2 Jan 2005 03:05:13 -0000 1.4
@@ -49,8 +49,10 @@
public abstract class CheckOutCommandTckTest
extends ScmTestCase
{
+ private File workingDirectory;
+
// ----------------------------------------------------------------------
- // Methods the test has to implement
+ // Methods the provider test has to implement
// ----------------------------------------------------------------------
public abstract String getScmUrl()
@@ -80,12 +82,10 @@
return PlexusTestCase.getTestFile( "target/scm-test/working-copy" );
}
- public void testCheckOutCommandTest()
+ protected void setUp()
throws Exception
{
- // ----------------------------------------------------------------------
- // Set up
- // ----------------------------------------------------------------------
+ super.setUp();
File repositoryRoot = getTestFile( "target/checkout-tck-test/repository" );
@@ -96,7 +96,7 @@
assertTrue( "Could not make the repository root directory: " + repositoryRoot.getAbsolutePath(), repositoryRoot.mkdirs() );
- File workingDirectory = getTestFile( "target/checkout-tck-test/working-copy" );
+ workingDirectory = getTestFile( "target/checkout-tck-test/working-copy" );
if ( workingDirectory.exists() )
{
@@ -105,27 +105,19 @@
assertTrue( "Could not make the working directory: " + workingDirectory.getAbsolutePath(), workingDirectory.mkdirs() );
- String tag = null;
-
- // ----------------------------------------------------------------------
- // Initialize
- // ----------------------------------------------------------------------
-
initRepo();
+ }
+
+ public void testCheckOutCommandTest()
+ throws Exception
+ {
+ String tag = null;
ScmManager scmManager = getScmManager();
ScmRepository repository = scmManager.makeScmRepository( getScmUrl() );
- // ----------------------------------------------------------------------
- // Execute
- // ----------------------------------------------------------------------
-
CheckOutScmResult result = scmManager.checkOut( repository, new ScmFileSet( workingDirectory ), tag );
-
- // ----------------------------------------------------------------------
- // Assert
- // ----------------------------------------------------------------------
assertResultIsSuccess( result );
1.7 +3 -3 maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
Index: UpdateCommandTckTest.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UpdateCommandTckTest.java 30 Dec 2004 13:12:00 -0000 1.6
+++ UpdateCommandTckTest.java 2 Jan 2005 03:05:13 -0000 1.7
@@ -126,13 +126,13 @@
FileUtils.deleteDirectory( getWorkingCopy() );
FileUtils.deleteDirectory( getUpdatingCopy() );
+
+ initRepo();
}
public void testUpdateCommand()
throws Exception
{
- initRepo();
-
checkOut( getWorkingCopy() );
checkOut( getUpdatingCopy() );