Author: olamy Date: Sun Dec 26 15:48:35 2010 New Revision: 1052904 URL: http://svn.apache.org/viewvc?rev=1052904&view=rev Log: fix junit. upgrade to surefire 2.7.1
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.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/SvnExeUpdateCommandTckTest.java maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java maven/scm/trunk/pom.xml Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java?rev=1052904&r1=1052903&r2=1052904&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java Sun Dec 26 15:48:35 2010 @@ -19,6 +19,7 @@ package org.apache.maven.scm.command.upd * under the License. */ +import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmResult; import java.util.ArrayList; @@ -45,6 +46,7 @@ public class UpdateScmResult super( commandLine, null, null, true ); this.updatedFiles = updatedFiles; + } public UpdateScmResult( List updatedFiles, List changes, ScmResult result ) @@ -56,11 +58,18 @@ public class UpdateScmResult this.changes = changes; } + /** + * + * @return List of {...@link ScmFile} + */ public List getUpdatedFiles() { return updatedFiles; } + /** + * @return {...@link List} of {...@link String} + */ public List getChanges() { if ( changes == null ) Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java?rev=1052904&r1=1052903&r2=1052904&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java Sun Dec 26 15:48:35 2010 @@ -19,8 +19,14 @@ package org.apache.maven.scm.provider.sv * under the License. */ +import java.io.File; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + import org.apache.maven.scm.ScmBranch; import org.apache.maven.scm.ScmException; +import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmTag; import org.apache.maven.scm.ScmVersion; @@ -41,8 +47,6 @@ import org.codehaus.plexus.util.cli.Comm import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; -import java.io.File; - /** * @author <a href="mailto:eveni...@apache.org">Emmanuel Venisse</a> * @version $Id$ @@ -83,8 +87,18 @@ public class SvnUpdateCommand return new UpdateScmResult( cl.toString(), "The svn command failed.", stderr.getOutput(), false ); } - return new UpdateScmResultWithRevision( cl.toString(), consumer.getUpdatedFiles(), + UpdateScmResultWithRevision result = new UpdateScmResultWithRevision( cl.toString(), consumer.getUpdatedFiles(), String.valueOf( consumer.getRevision() ) ); + if ( !result.getUpdatedFiles().isEmpty() ) + { + for ( Iterator ite = result.getUpdatedFiles().iterator(); ite.hasNext(); ) + { + ScmFile scmFile = (ScmFile) ite.next(); + result.getChanges().add( scmFile.getPath() ); + } + } + + return result; } // ---------------------------------------------------------------------- Modified: 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/SvnExeUpdateCommandTckTest.java URL: http://svn.apache.org/viewvc/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/SvnExeUpdateCommandTckTest.java?rev=1052904&r1=1052903&r2=1052904&view=diff ============================================================================== --- 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/SvnExeUpdateCommandTckTest.java (original) +++ 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/SvnExeUpdateCommandTckTest.java Sun Dec 26 15:48:35 2010 @@ -28,4 +28,5 @@ import org.apache.maven.scm.provider.svn public class SvnExeUpdateCommandTckTest extends SvnUpdateCommandTckTest { + // no op } Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java?rev=1052904&r1=1052903&r2=1052904&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java Sun Dec 26 15:48:35 2010 @@ -140,7 +140,7 @@ public abstract class UpdateCommandTckTe assertNotNull( "The changed files list is null", changedFiles ); - assertFalse( "The changed files list is empty", changedFiles.isEmpty() ); + assertFalse( "The changed files list is empty ", changedFiles.isEmpty() ); for ( Iterator i = changedFiles.iterator(); i.hasNext(); ) { Modified: maven/scm/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=1052904&r1=1052903&r2=1052904&view=diff ============================================================================== --- maven/scm/trunk/pom.xml (original) +++ maven/scm/trunk/pom.xml Sun Dec 26 15:48:35 2010 @@ -294,12 +294,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.6</version> + <version>2.7.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.6</version> + <version>2.7.1</version> </plugin> </plugins> </pluginManagement>