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 ol...@apache.org on 2010/12/26 21:09:06 UTC
svn commit: r1052935 - in /maven/scm/trunk:
maven-scm-api/src/main/java/org/apache/maven/scm/command/update/
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/
ma...
Author: olamy
Date: Sun Dec 26 20:09:05 2010
New Revision: 1052935
URL: http://svn.apache.org/viewvc?rev=1052935&view=rev
Log:
so should fix test on the grid.
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/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateConsumer.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
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=1052935&r1=1052934&r2=1052935&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 20:09:05 2010
@@ -19,6 +19,7 @@ package org.apache.maven.scm.command.upd
* under the License.
*/
+import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmResult;
@@ -68,7 +69,7 @@ public class UpdateScmResult
}
/**
- * @return {@link List} of {@link String}
+ * @return {@link List} of {@link ChangeSet}
*/
public List getChanges()
{
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=1052935&r1=1052934&r2=1052935&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 20:09:05 2010
@@ -22,6 +22,7 @@ package org.apache.maven.scm.provider.sv
import java.io.File;
import java.util.Iterator;
+import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
@@ -87,14 +88,9 @@ public class SvnUpdateCommand
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() );
- }
- }
+
+ result.setChanges( consumer.getChangeSets() );
+ getLogger().info( "changeSets " + consumer.getChangeSets());
return result;
}
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/SvnUpdateConsumer.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/SvnUpdateConsumer.java?rev=1052935&r1=1052934&r2=1052935&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/SvnUpdateConsumer.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/SvnUpdateConsumer.java Sun Dec 26 20:09:05 2010
@@ -19,14 +19,18 @@ package org.apache.maven.scm.provider.sv
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.maven.scm.ChangeFile;
+import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.svn.svnexe.command.AbstractFileCheckingConsumer;
-import java.io.File;
-import java.util.List;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -41,6 +45,8 @@ public class SvnUpdateConsumer
private static final String EXPORTED_REVISION_TOKEN = "Exported revision";
private static final String RESTORED_TOKEN = "Restored";
+
+ private List /* ChangeSet */ changeSets = new ArrayList();
// ----------------------------------------------------------------------
//
@@ -119,10 +125,27 @@ public class SvnUpdateConsumer
}
addFile( new ScmFile( file, status ) );
+
+ List /** ChangeFile */
+ changeFiles =
+ Arrays.asList( new ChangeFile[] { new ChangeFile( line, Integer.valueOf( revision ).toString() ) } );
+
+ ChangeSet changeSet = new ChangeSet( null, null, null, changeFiles );
+ changeSets.add( changeSet );
}
public List getUpdatedFiles()
{
return getFiles();
}
+
+ public List getChangeSets()
+ {
+ return changeSets;
+ }
+
+ public void setChangeSets( List changeSets )
+ {
+ this.changeSets = changeSets;
+ }
}
Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java?rev=1052935&r1=1052934&r2=1052935&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java (original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java Sun Dec 26 20:09:05 2010
@@ -19,6 +19,13 @@ package org.apache.maven.scm;
* under the License.
*/
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.PlexusTestCase;
@@ -28,13 +35,6 @@ import org.codehaus.plexus.util.cli.Comm
import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-
/**
* Base class for all scm tests. Consumers will typically
* extend this class while tck test would extend ScmTckTestCase.
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=1052935&r1=1052934&r2=1052935&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 20:09:05 2010
@@ -35,6 +35,7 @@ import org.apache.maven.scm.command.chec
import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
+import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -76,6 +77,15 @@ public abstract class UpdateCommandTckTe
public void testUpdateCommand()
throws Exception
{
+
+ FileUtils.deleteDirectory( getUpdatingCopy() );
+
+ assertFalse( getUpdatingCopy().exists() );
+
+ //FileUtils.deleteDirectory( getWorkingCopy() );
+
+ //assertFalse( getUpdatingCopy().exists() );
+
ScmRepository repository = makeScmRepository( getScmUrl() );
checkOut( getUpdatingCopy(), repository );
@@ -116,16 +126,16 @@ public abstract class UpdateCommandTckTe
ScmManager scmManager = getScmManager();
- Date lastUpdate = new Date( System.currentTimeMillis() );
+ Date lastUpdate = new Date( System.currentTimeMillis() - 100000 );
- Thread.sleep( 1000 );
+ //Thread.sleep( 2000 );
commit( getWorkingCopy(), repository );
// ----------------------------------------------------------------------
// Update the project
// ----------------------------------------------------------------------
-
+
UpdateScmResult result = scmManager.update( repository, new ScmFileSet( getUpdatingCopy() ), lastUpdate );
assertNotNull( "The command returned a null result.", result );
@@ -134,15 +144,15 @@ public abstract class UpdateCommandTckTe
List updatedFiles = result.getUpdatedFiles();
- List changedFiles = result.getChanges();
+ List changedSets = result.getChanges();
assertEquals( "Expected 3 files in the updated files list " + updatedFiles, 3, updatedFiles.size() );
- assertNotNull( "The changed files list is null", changedFiles );
+ assertNotNull( "The changed files list is null", changedSets );
- assertFalse( "The changed files list is empty ", changedFiles.isEmpty() );
+ assertFalse( "The changed files list is empty ", changedSets.isEmpty() );
- for ( Iterator i = changedFiles.iterator(); i.hasNext(); )
+ for ( Iterator i = changedSets.iterator(); i.hasNext(); )
{
ChangeSet changeSet = (ChangeSet) i.next();
System.out.println( changeSet.toXML() );
@@ -171,4 +181,5 @@ public abstract class UpdateCommandTckTe
//TODO : Consolidate file status so that we can remove "|| ADDED" term
assertTrue( file.getStatus().isUpdate() || file.getStatus() == ScmFileStatus.ADDED );
}
+
}