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 tr...@apache.org on 2004/10/28 15:06:23 UTC
cvs commit: maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/update CvsUpdateCommandTest.java
trygvis 2004/10/28 06:06:23
Modified: maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib
AbstractCvsConsumer.java
maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog
CvsChangeLogCommand.java CvsChangeLogConsumer.java
maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin
CvsCheckInCommand.java
maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout
CvsCheckOutCommand.java CvsCheckOutConsumer.java
maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag
CvsTagCommand.java
maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update
CvsUpdateCommand.java CvsUpdateConsumer.java
maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog
CvsChangeLogCommandTest.java
CvsChangeLogConsumerTest.java
maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkin
CvsCheckInCommandTest.java
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
Log:
o Aligning with changes from the API.
o The stream consumers now uses the Plexus Logger and not System.err which
really isn't a useful way of debugging.
o When checking out code the content is checked out into the working directory
and not "<working directory>/<module name>". This is much more managable and is
hopefully a more compatible with SCM that doesn't have a "module" consept.
o The tag command now returns the command output properly inside a TagScmResult.
Revision Changes Path
1.3 +19 -9 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsConsumer.java
Index: AbstractCvsConsumer.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsConsumer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractCvsConsumer.java 26 Oct 2004 12:43:16 -0000 1.2
+++ AbstractCvsConsumer.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -23,8 +23,10 @@
import org.apache.maven.scm.ScmFileStatus;
import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.codehaus.plexus.logging.Logger;
/**
+ * @deprecated
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -36,8 +38,11 @@
private List allowedCodes = new ArrayList();
- public AbstractCvsConsumer()
+ private Logger logger;
+
+ public AbstractCvsConsumer( Logger logger )
{
+ this.logger = logger;
}
// ----------------------------------------------------------------------
@@ -48,7 +53,7 @@
{
if ( line.length() < 3 )
{
- System.err.println( "Unable to parse output from command: line length must be bigger than 3." );
+ getLogger().warn( "Unable to parse output from command: line length must be bigger than 3." );
}
String status = line.substring( 0, 2 );
@@ -57,7 +62,7 @@
if ( !allowedCodes.contains( status ) )
{
- System.err.println( "Unexpected file status: '" + status.charAt( 0 ) + "'." );
+ getLogger().warn( "Unexpected file status: '" + status.charAt( 0 ) + "'." );
return;
}
@@ -76,18 +81,23 @@
}
else
{
- System.err.println( "Unknown status: '" + status + "'." );
+ getLogger().warn( "Unknown status: '" + status + "'." );
}
}
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ protected Logger getLogger()
+ {
+ return this.logger;
+ }
+
public List getFiles()
{
return files;
}
-
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
public void allowCode( char code )
{
1.3 +3 -3 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java
Index: CvsChangeLogCommand.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsChangeLogCommand.java 26 Oct 2004 12:43:16 -0000 1.2
+++ CvsChangeLogCommand.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -90,7 +90,7 @@
cl.createArgument().setValue( "-r" + branch );
}
- ChangeLogConsumer consumer = new CvsChangeLogConsumer();
+ ChangeLogConsumer consumer = new CvsChangeLogConsumer( getLogger() );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
@@ -107,7 +107,7 @@
if ( exitCode != 0 )
{
- return new ChangeLogScmResult( "The cvs command failed.", stderr.getOutput() );
+ return new ChangeLogScmResult( "The cvs command failed.", stderr.getOutput(), false );
}
return new ChangeLogScmResult( consumer.getModifications() );
1.3 +9 -4 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java
Index: CvsChangeLogConsumer.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsChangeLogConsumer.java 26 Oct 2004 12:43:16 -0000 1.2
+++ CvsChangeLogConsumer.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -27,6 +27,7 @@
import org.apache.maven.scm.command.changelog.ChangeLogConsumer;
import org.apache.maven.scm.command.changelog.ChangeLogEntry;
import org.apache.maven.scm.command.changelog.ChangeLogFile;
+import org.codehaus.plexus.logging.Logger;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
@@ -84,6 +85,12 @@
/** the current file being processed by the parser */
private ChangeLogFile currentFile = null;
+ private Logger logger;
+
+ public CvsChangeLogConsumer( Logger logger )
+ {
+ this.logger = logger;
+ }
public List getModifications()
{
@@ -114,9 +121,7 @@
}
catch( Throwable ex )
{
- System.err.println( "Exception in the cvs changelog consumer." );
-
- ex.printStackTrace( System.err );
+ logger.warn( "Exception in the cvs changelog consumer.", ex );
}
}
1.3 +2 -2 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java
Index: CvsCheckInCommand.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsCheckInCommand.java 26 Oct 2004 12:43:16 -0000 1.2
+++ CvsCheckInCommand.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -112,7 +112,7 @@
if ( exitCode != 0 )
{
- return new CheckInScmResult( "The cvs command failed.", stderr.getOutput() );
+ return new CheckInScmResult( "The cvs command failed.", stderr.getOutput(), false );
}
return new CheckInScmResult( consumer.getCheckedInFiles() );
1.3 +10 -3 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java
Index: CvsCheckOutCommand.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsCheckOutCommand.java 26 Oct 2004 12:43:17 -0000 1.2
+++ CvsCheckOutCommand.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -62,14 +62,21 @@
cl.createArgument().setValue( "-r" + tag );
}
+ cl.createArgument().setValue( "-d" );
+
+ cl.createArgument().setValue( workingDirectory.getAbsolutePath() );
+
cl.createArgument().setValue( repository.getModule() );
- CvsCheckOutConsumer consumer = new CvsCheckOutConsumer();
+ CvsCheckOutConsumer consumer = new CvsCheckOutConsumer( getLogger(), workingDirectory );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
int exitCode;
+ getLogger().debug( "Working directory: " + workingDirectory.getAbsolutePath() );
+ getLogger().debug( "Command line: " + cl );
+
try
{
exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );
@@ -81,7 +88,7 @@
if ( exitCode != 0 )
{
- return new CheckOutScmResult( "The cvs command failed.", stderr.getOutput() );
+ return new CheckOutScmResult( "The cvs command failed.", stderr.getOutput(), false );
}
return new CheckOutScmResult( consumer.getCheckedOutFiles() );
1.3 +22 -4 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutConsumer.java
Index: CvsCheckOutConsumer.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutConsumer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsCheckOutConsumer.java 26 Oct 2004 12:43:17 -0000 1.2
+++ CvsCheckOutConsumer.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -18,11 +18,13 @@
import java.util.ArrayList;
import java.util.List;
+import java.io.File;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.codehaus.plexus.logging.Logger;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -31,19 +33,35 @@
public class CvsCheckOutConsumer
implements StreamConsumer
{
- List files = new ArrayList();
+ private Logger logger;
+
+ private String workingDirectory;
+
+ private List files = new ArrayList();
+
+ public CvsCheckOutConsumer( Logger logger, File workingDirectory )
+ {
+ this.logger = logger;
+
+ this.workingDirectory = workingDirectory.getAbsolutePath();
+ }
public void consumeLine( String line )
{
if ( line.length() < 3 )
{
- System.err.println( "Unable to parse output from command: line length must be bigger than 3." );
+ logger.warn( "Unable to parse output from command: line length must be bigger than 3." );
}
String status = line.substring( 0, 2 );
String file = line.substring( 2 );
+ if ( file.startsWith( workingDirectory ) )
+ {
+ file = file.substring( workingDirectory.length() );
+ }
+
if ( status.equals( "U " ) )
{
files.add( new ScmFile( file, ScmFileStatus.UPDATED ) );
@@ -58,7 +76,7 @@
}
else
{
- System.err.println( "Unknown status: '" + status + "'." );
+ logger.warn( "Unknown status: '" + status + "'." );
}
}
1.3 +9 -4 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagCommand.java
Index: CvsTagCommand.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsTagCommand.java 26 Oct 2004 12:43:17 -0000 1.2
+++ CvsTagCommand.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -17,10 +17,12 @@
*/
import java.io.File;
+import java.util.ArrayList;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.command.tag.AbstractTagCommand;
+import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.cvslib.command.CvsCommand;
import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
@@ -62,9 +64,11 @@
int exitCode;
+ CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
+
try
{
- exitCode = CommandLineUtils.executeCommandLine( cl, null, null );
+ exitCode = CommandLineUtils.executeCommandLine( cl, null, stderr );
}
catch( CommandLineException ex )
{
@@ -73,9 +77,10 @@
if ( exitCode != 0 )
{
- return new ScmResult.Failure();
+ // TODO: Improve this error message
+ return new TagScmResult( "The cvs tag command failed.", stderr.getOutput(), false );
}
- return new ScmResult();
+ return new TagScmResult( new ArrayList() );
}
}
1.3 +6 -4 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommand.java
Index: CvsUpdateCommand.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsUpdateCommand.java 26 Oct 2004 12:43:17 -0000 1.2
+++ CvsUpdateCommand.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -49,7 +49,7 @@
cl.setWorkingDirectory( new File( workingDirectory, repository.getModule() ).getAbsolutePath() );
-// cl.createArgument().setValue( "-q" );
+ cl.createArgument().setValue( "-q" );
cl.createArgument().setValue( "update" );
@@ -58,10 +58,12 @@
cl.createArgument().setValue( "-r" + tag );
}
- CvsUpdateConsumer consumer = new CvsUpdateConsumer();
+ CvsUpdateConsumer consumer = new CvsUpdateConsumer( getLogger() );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
+ getLogger().debug( "Executing: " + cl );
+
int exitCode;
try
@@ -75,7 +77,7 @@
if ( exitCode != 0 )
{
- return new UpdateScmResult( "The cvs command failed.", stderr.getOutput() );
+ return new UpdateScmResult( "The cvs command failed.", stderr.getOutput(), false );
}
return new UpdateScmResult( consumer.getUpdatedFiles() );
1.3 +12 -4 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
Index: CvsUpdateConsumer.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsUpdateConsumer.java 26 Oct 2004 12:43:17 -0000 1.2
+++ CvsUpdateConsumer.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -22,6 +22,7 @@
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
+import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.cli.StreamConsumer;
/**
@@ -31,13 +32,20 @@
public class CvsUpdateConsumer
implements StreamConsumer
{
- List files = new ArrayList();
+ private Logger logger;
+
+ private List files = new ArrayList();
+
+ public CvsUpdateConsumer( Logger logger )
+ {
+ this.logger = logger;
+ }
public void consumeLine( String line )
{
if ( line.length() < 3 )
{
- System.err.println( "Unable to parse output from command: line length must be bigger than 3." );
+ logger.warn( "Unable to parse output from command: line length must be bigger than 3." );
}
String status = line.substring( 0, 2 );
@@ -58,7 +66,7 @@
}
else
{
- System.err.println( "Unknown status: '" + status + "'." );
+ logger.warn( "Unknown status: '" + status + "'." );
}
}
1.3 +2 -2 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java
Index: CvsChangeLogCommandTest.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsChangeLogCommandTest.java 26 Oct 2004 12:43:17 -0000 1.2
+++ CvsChangeLogCommandTest.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -78,7 +78,7 @@
if ( !changeLogResult.isSuccess() )
{
- fail( changeLogResult.getMessage() + "\n" + changeLogResult.getLongMessage() );
+ fail( changeLogResult.getProviderMessage() + "\n" + changeLogResult.getCommandOutput() );
}
List changeLog = changeLogResult.getChangeLog();
1.3 +2 -3 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
Index: CvsChangeLogConsumerTest.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsChangeLogConsumerTest.java 26 Oct 2004 12:43:17 -0000 1.2
+++ CvsChangeLogConsumerTest.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -25,7 +25,6 @@
import org.apache.maven.scm.command.changelog.ChangeLogEntry;
import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
-import org.apache.maven.scm.provider.cvslib.command.changelog.CvsChangeLogConsumer;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -56,7 +55,7 @@
public void testParse()
throws Exception
{
- CvsChangeLogConsumer command = new CvsChangeLogConsumer();
+ CvsChangeLogConsumer command = new CvsChangeLogConsumer( null );
FileInputStream fis = new FileInputStream( testFile );
BufferedReader in = new BufferedReader(new InputStreamReader(fis));
1.3 +3 -3 maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommandTest.java
Index: CvsCheckInCommandTest.java
===================================================================
RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommandTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsCheckInCommandTest.java 26 Oct 2004 12:43:17 -0000 1.2
+++ CvsCheckInCommandTest.java 28 Oct 2004 13:06:21 -0000 1.3
@@ -134,9 +134,9 @@
assertEquals( "/test-repo/check-in/Readme.txt", file2.getPath() );
- assertNull( result.getMessage() );
+ assertNull( result.getProviderMessage() );
- assertNull( result.getLongMessage() );
+ assertNull( result.getCommandOutput() );
}
// ----------------------------------------------------------------------
1.3 +9 -9 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsCheckoutCommandTest.java 26 Oct 2004 12:43:17 -0000 1.2
+++ CvsCheckoutCommandTest.java 28 Oct 2004 13:06:23 -0000 1.3
@@ -47,7 +47,7 @@
if ( !result.isSuccess() )
{
- fail( result.getMessage() + "\n" + result.getLongMessage() );
+ fail( result.getProviderMessage() + "\n" + result.getCommandOutput() );
}
List files = result.getCheckedOutFiles();
@@ -56,11 +56,11 @@
assertEquals( 3, files.size() );
- assertCheckedOutFile( files, 0, "Foo.java", ScmFileStatus.UPDATED );
+ assertCheckedOutFile( files, 0, "/Foo.java", ScmFileStatus.UPDATED );
- assertCheckedOutFile( files, 1, "Readme.txt", ScmFileStatus.UPDATED );
+ assertCheckedOutFile( files, 1, "/Readme.txt", ScmFileStatus.UPDATED );
- assertCheckedOutFile( files, 2, "src/java/org/apache/maven/MavenUtils.java", ScmFileStatus.UPDATED );
+ assertCheckedOutFile( files, 2, "/src/java/org/apache/maven/MavenUtils.java", ScmFileStatus.UPDATED );
}
public void testCheckOutWithTag()
@@ -72,7 +72,7 @@
if ( !result.isSuccess() )
{
- fail( result.getMessage() + "\n" + result.getLongMessage() );
+ fail( result.getProviderMessage() + "\n" + result.getCommandOutput() );
}
List files = result.getCheckedOutFiles();
@@ -81,7 +81,7 @@
assertEquals( 1, files.size() );
- File mavenUtils = assertCheckedOutFile( files, 0, "src/java/org/apache/maven/MavenUtils.java", ScmFileStatus.UPDATED );
+ File mavenUtils = assertCheckedOutFile( files, 0, "/src/java/org/apache/maven/MavenUtils.java", ScmFileStatus.UPDATED );
assertEquals( 38403, mavenUtils.length() );
}
@@ -92,7 +92,7 @@
private File assertCheckedOutFile( List files, int i, String fileName, ScmFileStatus status )
{
- File file = new File( getWorkingDirectory() + "/test-repo/checkout/" + fileName );
+ File file = new File( getWorkingDirectory(), fileName );
assertTrue( file.getAbsolutePath() + " file doesn't exist.", file.exists() );
@@ -100,7 +100,7 @@
assertSame( status, coFile.getStatus() );
- assertEquals( "test-repo/checkout/" + fileName, coFile.getPath() );
+ assertEquals( fileName, coFile.getPath() );
return file;
}
1.3 +9 -9 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsUpdateCommandTest.java 26 Oct 2004 12:43:17 -0000 1.2
+++ CvsUpdateCommandTest.java 28 Oct 2004 13:06:23 -0000 1.3
@@ -102,16 +102,16 @@
if ( !result.isSuccess() )
{
- System.out.println( "result.message: " + result.getMessage() );
+ System.out.println( "result.providerMessage: " + result.getProviderMessage() );
- System.out.println( "result.longMessage: " + result.getLongMessage() );
+ System.out.println( "result.commandOutput: " + result.getCommandOutput() );
fail( "Command failed" );
}
- assertNull( result.getMessage() );
+ assertNull( result.getProviderMessage() );
- assertNull( result.getLongMessage() );
+ assertNull( result.getCommandOutput() );
assertNotNull( result.getUpdatedFiles() );
@@ -152,16 +152,16 @@
if ( !result.isSuccess() )
{
- System.out.println( "result.message: " + result.getMessage() );
+ System.out.println( "result.providerMessage: " + result.getProviderMessage() );
- System.out.println( "result.longMessage: " + result.getLongMessage() );
+ System.out.println( "result.commandOutput: " + result.getCommandOutput() );
fail( "Command failed" );
}
- assertNull( result.getMessage() );
+ assertNull( result.getProviderMessage() );
- assertNull( result.getLongMessage() );
+ assertNull( result.getCommandOutput() );
assertNotNull( result.getUpdatedFiles() );