maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update UpdateCommandTckTest.java
Date Fri, 24 Dec 2004 01:21:35 GMT
brett       2004/12/23 17:21:35

  Modified:    maven-scm-api/src/main/java/org/apache/maven/scm/manager
                        DefaultScmManager.java ScmManager.java
               maven-scm-api/src/main/java/org/apache/maven/scm
                        ScmTestCase.java
               maven-scm-api/src/test/java/org/apache/maven/scm/manager
                        ScmManagerTest.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/test/java/org/apache/maven/scm/provider/cvslib/command/changelog
                        CvsChangeLogCommandTest.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
               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
  Added:       maven-scm-api/src/main/java/org/apache/maven/scm
                        ScmFileSet.java
  Log:
  add ScmFileSet instead of workingDirectory
  
  Revision  Changes    Path
  1.6       +20 -25    maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/manager/DefaultScmManager.java
  
  Index: DefaultScmManager.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/manager/DefaultScmManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultScmManager.java	22 Dec 2004 08:04:40 -0000	1.5
  +++ DefaultScmManager.java	24 Dec 2004 01:21:35 -0000	1.6
  @@ -16,17 +16,7 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.util.Date;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
  -
  -import org.apache.maven.scm.CommandNameConstants;
  -import org.apache.maven.scm.CommandParameter;
  -import org.apache.maven.scm.CommandParameters;
  -import org.apache.maven.scm.ScmException;
  -import org.apache.maven.scm.ScmResult;
  +import org.apache.maven.scm.*;
   import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
   import org.apache.maven.scm.command.checkin.CheckInScmResult;
   import org.apache.maven.scm.command.checkout.CheckOutScmResult;
  @@ -37,10 +27,14 @@
   import org.apache.maven.scm.provider.ScmProviderRepository;
   import org.apache.maven.scm.repository.ScmRepository;
   import org.apache.maven.scm.repository.ScmRepositoryException;
  -
   import org.codehaus.plexus.logging.AbstractLogEnabled;
   import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
   
  +import java.util.Date;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
    * @version $Id$
  @@ -128,19 +122,19 @@
       // Scm commands
       // ----------------------------------------------------------------------
   
  -    public CheckOutScmResult checkOut( ScmRepository repository, File workingDirectory,
String tag )
  +    public CheckOutScmResult checkOut( ScmRepository repository, ScmFileSet fileSet, String
tag )
           throws ScmException
       {
           CommandParameters parameters = new CommandParameters();
   
           parameters.setString( CommandParameter.TAG, tag );
   
  -        ScmResult scmResult = execute( CommandNameConstants.CHECK_OUT, repository, workingDirectory,
parameters );
  +        ScmResult scmResult = execute( CommandNameConstants.CHECK_OUT, repository, fileSet,
parameters );
   
           return (CheckOutScmResult) checkScmResult( CheckOutScmResult.class, scmResult );
       }
   
  -    public CheckInScmResult checkIn( ScmRepository repository, File workingDirectory, String
tag, String message )
  +    public CheckInScmResult checkIn( ScmRepository repository, ScmFileSet fileSet, String
tag, String message )
           throws ScmException
       {
           CommandParameters parameters = new CommandParameters();
  @@ -149,36 +143,36 @@
   
           parameters.setString( CommandParameter.MESSAGE, message );
   
  -        ScmResult scmResult = execute( CommandNameConstants.CHECK_IN, repository, workingDirectory,
parameters );
  +        ScmResult scmResult = execute( CommandNameConstants.CHECK_IN, repository, fileSet,
parameters );
   
           return (CheckInScmResult) checkScmResult( CheckInScmResult.class, scmResult );
       }
   
  -    public TagScmResult tag( ScmRepository repository, File workingDirectory, String tag
)
  +    public TagScmResult tag( ScmRepository repository, ScmFileSet fileSet, String tag )
           throws ScmException
       {
           CommandParameters parameters = new CommandParameters();
   
           parameters.setString( CommandParameter.TAG, tag );
   
  -        ScmResult scmResult = execute( CommandNameConstants.TAG, repository, workingDirectory,
parameters );
  +        ScmResult scmResult = execute( CommandNameConstants.TAG, repository, fileSet, parameters
);
   
           return (TagScmResult) checkScmResult( TagScmResult.class, scmResult );
       }
   
  -    public UpdateScmResult update( ScmRepository repository, File workingDirectory, String
tag )
  +    public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, String
tag )
           throws ScmException
       {
           CommandParameters parameters = new CommandParameters();
   
           parameters.setString( CommandParameter.TAG, tag );
   
  -        ScmResult scmResult = execute( CommandNameConstants.UPDATE, repository, workingDirectory,
parameters );
  +        ScmResult scmResult = execute( CommandNameConstants.UPDATE, repository, fileSet,
parameters );
   
           return (UpdateScmResult) checkScmResult( UpdateScmResult.class, scmResult );
       }
   
  -    public ChangeLogScmResult changeLog( ScmRepository repository, File workingDirectory,
Date startDate, Date endDate, int numDays, String branch )
  +    public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet,
Date startDate, Date endDate, int numDays, String branch )
           throws ScmException
       {
           CommandParameters parameters = new CommandParameters();
  @@ -189,7 +183,7 @@
   
           parameters.setString( CommandParameter.BRANCH, branch );
   
  -        ScmResult scmResult = execute( CommandNameConstants.CHANGE_LOG, repository, workingDirectory,
parameters );
  +        ScmResult scmResult = execute( CommandNameConstants.CHANGE_LOG, repository, fileSet,
parameters );
   
           return (ChangeLogScmResult) checkScmResult( ChangeLogScmResult.class, scmResult
);
       }
  @@ -198,12 +192,13 @@
       //
       // ----------------------------------------------------------------------
   
  -    private  ScmResult execute( String commandName, ScmRepository repository, File workingDirectory,
CommandParameters parameters )
  +    private  ScmResult execute( String commandName, ScmRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
           throws ScmException
       {
           ScmProvider scmProvider = getScmProvider( repository.getProvider() );
   
  -        return scmProvider.execute( commandName, repository.getProviderRepository(), workingDirectory,
parameters );
  +        // TODO: actually, probably passing fileset here too
  +        return scmProvider.execute( commandName, repository.getProviderRepository(), fileSet.getBasedir(),
parameters );
       }
   
       // ----------------------------------------------------------------------
  
  
  
  1.4       +7 -7      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
  
  Index: ScmManager.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ScmManager.java	22 Dec 2004 08:04:40 -0000	1.3
  +++ ScmManager.java	24 Dec 2004 01:21:35 -0000	1.4
  @@ -16,10 +16,10 @@
    * limitations under the License.
    */
   
  -import java.io.File;
   import java.util.Date;
   
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
   import org.apache.maven.scm.command.checkin.CheckInScmResult;
   import org.apache.maven.scm.command.checkout.CheckOutScmResult;
  @@ -47,18 +47,18 @@
       // Scm Commands
       // ----------------------------------------------------------------------
   
  -    CheckOutScmResult checkOut( ScmRepository repository, File workingDirectory, String
tag )
  +    CheckOutScmResult checkOut( ScmRepository repository, ScmFileSet fileSet, String tag
)
       	throws ScmException;
   
  -    CheckInScmResult checkIn( ScmRepository repository, File workingDirectory, String tag,
String message )
  +    CheckInScmResult checkIn( ScmRepository repository, ScmFileSet fileSet, String tag,
String message )
       	throws ScmException;
   
  -    UpdateScmResult update( ScmRepository repository, File workingDirectory, String tag
)
  +    UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, String tag )
           throws ScmException;
   
  -    TagScmResult tag( ScmRepository repository, File workingDirectory, String tag )
  +    TagScmResult tag( ScmRepository repository, ScmFileSet fileSet, String tag )
           throws ScmException;
   
  -    ChangeLogScmResult changeLog( ScmRepository repository, File workingDirectory, Date
startDate, Date endDate, int numDays, String branch )
  +    ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, Date startDate,
Date endDate, int numDays, String branch )
           throws ScmException;
   }
  
  
  
  1.9       +6 -1      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTestCase.java
  
  Index: ScmTestCase.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTestCase.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ScmTestCase.java	9 Nov 2004 15:23:12 -0000	1.8
  +++ ScmTestCase.java	24 Dec 2004 01:21:35 -0000	1.9
  @@ -116,6 +116,11 @@
           return getTestFile( "/src/test/repository" );
       }
   
  +    protected ScmFileSet getScmFileSet()
  +    {
  +        return new ScmFileSet( getWorkingDirectory() );
  +    }
  +
       protected File getWorkingDirectory()
       {
           String testName = this.getClass().getName().substring( this.getClass().getName().lastIndexOf(
".") + 1 );
  
  
  
  1.1                  maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
  
  Index: ScmFileSet.java
  ===================================================================
  package org.apache.maven.scm;
  
  import java.io.File;
  import java.util.Arrays;
  
  /*
   * Copyright 2001-2004 The Apache Software Foundation.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
   *      http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  /**
   * @author <a href="mailto:brett@apache.org">Brett Porter</a>
   * @version $Id: ScmFileSet.java,v 1.1 2004/12/24 01:21:35 brett Exp $
   */
  public class ScmFileSet
  {
      private File basedir;
  
      private ScmFile[] files;
  
      public ScmFileSet( File basedir )
      {
          this.basedir = basedir;
          this.files = null;
      }
  
      public ScmFileSet( File basedir, String includes, String excludes )
      {
          this.basedir = basedir;
  
          // TODO: resolve files
      }
  
      public ScmFileSet( File basedir, ScmFile[] files )
      {
          this.basedir = basedir;
          this.files = files;
      }
  
      public File getBasedir()
      {
          return basedir;
      }
  
      public ScmFile[] getFiles()
      {
          return this.files;
      }
  
      public String toString() {
          return "basedir = " + basedir + "; files = " + Arrays.asList(files);
      }
  }
  
  
  
  1.3       +3 -2      maven-scm/maven-scm-api/src/test/java/org/apache/maven/scm/manager/ScmManagerTest.java
  
  Index: ScmManagerTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/test/java/org/apache/maven/scm/manager/ScmManagerTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ScmManagerTest.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ ScmManagerTest.java	24 Dec 2004 01:21:35 -0000	1.3
  @@ -17,6 +17,7 @@
    */
   
   import org.apache.maven.scm.ScmTestCase;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.manager.NoSuchScmProviderException;
   import org.apache.maven.scm.manager.ScmManager;
   
  @@ -39,7 +40,7 @@
   
           try
           {
  -            scmManager.checkOut( scmManager.makeScmRepository( "scm:non-existing-scm:"
), getTestFile( "" ), null );
  +            scmManager.checkOut( scmManager.makeScmRepository( "scm:non-existing-scm:"
), new ScmFileSet( getTestFile( "" ) ), null );
   
               fail( "Expected NoSuchScmTypeException" );
           }
  
  
  
  1.4       +3 -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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CvsCheckInCommand.java	28 Oct 2004 13:06:21 -0000	1.3
  +++ CvsCheckInCommand.java	24 Dec 2004 01:21:35 -0000	1.4
  @@ -84,7 +84,8 @@
   
           cl.createArgument().setValue( messageFile.getAbsolutePath() );
   
  -        cl.createArgument().setValue( repository.getModule() );
  +        // TODO: should be committing files here instead - for now check in everything
  +        // cl.createArgument().setValue( repository.getModule() );
   
           CvsCheckInConsumer consumer = new CvsCheckInConsumer( repository.getPath() );
   
  
  
  
  1.5       +4 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CvsChangeLogCommandTest.java	2 Nov 2004 22:09:13 -0000	1.4
  +++ CvsChangeLogCommandTest.java	24 Dec 2004 01:21:35 -0000	1.5
  @@ -22,6 +22,7 @@
   import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
  +import org.apache.maven.scm.ScmFileSet;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
  @@ -73,7 +74,8 @@
   
           executeCVS( getWorkingDirectory(), "-d " + getTestFile( "src/test/repository/"
) + " co " + getModule() );
   
  -        ChangeLogScmResult changeLogResult = scmManager.changeLog( getScmUrl(), getWorkingDirectory(),
startDate, endDate, 0, branch );
  +        ChangeLogScmResult changeLogResult = scmManager.changeLog( getScmUrl(), getScmFileSet(),
startDate, endDate, 0,
  +                                                                   branch );
   
           if ( !changeLogResult.isSuccess() )
           {
  
  
  
  1.5       +4 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CvsCheckInCommandTest.java	31 Oct 2004 14:19:05 -0000	1.4
  +++ CvsCheckInCommandTest.java	24 Dec 2004 01:21:35 -0000	1.5
  @@ -23,6 +23,7 @@
   
   import org.apache.maven.scm.ScmFile;
   import org.apache.maven.scm.ScmFileStatus;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.checkin.CheckInScmResult;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
  @@ -110,7 +111,8 @@
           ScmRepository scmRepository = makeScmRepository( "scm:cvs|local|" + repository.getAbsolutePath()
+ "|" + getModule() );
   
           // Check in the files
  -        CheckInScmResult result = scmManager.checkIn( scmRepository, workingDirectory,
null, "Commit message" );
  +        CheckInScmResult result = scmManager.checkIn( scmRepository, new ScmFileSet( workingDirectory
), null,
  +                                                      "Commit message" );
   
           assertNotNull( result );
   
  
  
  
  1.5       +3 -3      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CvsCheckoutCommandTest.java	31 Oct 2004 14:19:05 -0000	1.4
  +++ CvsCheckoutCommandTest.java	24 Dec 2004 01:21:35 -0000	1.5
  @@ -43,7 +43,7 @@
       {
           ScmManager scmManager = getScmManager();
   
  -        CheckOutScmResult result = scmManager.checkOut( getScmUrl(), getWorkingDirectory(),
null );
  +        CheckOutScmResult result = scmManager.checkOut( getScmUrl(), getScmFileSet(), null
);
   
           if ( !result.isSuccess() )
           {
  @@ -68,7 +68,7 @@
       {
           ScmManager scmManager = getScmManager();
   
  -        CheckOutScmResult result = scmManager.checkOut( getScmUrl(), getWorkingDirectory(),
"1.107.4" );
  +        CheckOutScmResult result = scmManager.checkOut( getScmUrl(), getScmFileSet(), "1.107.4"
);
   
           if ( !result.isSuccess() )
           {
  
  
  
  1.6       +4 -3      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CvsUpdateCommandTest.java	31 Oct 2004 14:19:05 -0000	1.5
  +++ CvsUpdateCommandTest.java	24 Dec 2004 01:21:35 -0000	1.6
  @@ -21,6 +21,7 @@
   
   import org.apache.maven.scm.ScmFile;
   import org.apache.maven.scm.ScmFileStatus;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.update.UpdateScmResult;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
  @@ -98,7 +99,7 @@
           // A new check out should return 0 updated files.
           ScmRepository scmRepository = scmManager.makeScmRepository( scmUrl );
   
  -        UpdateScmResult result = scmManager.update( scmRepository, assertionDirectory,
null );
  +        UpdateScmResult result = scmManager.update( scmRepository, new ScmFileSet( assertionDirectory
), null );
   
           assertNotNull( result );
   
  @@ -148,7 +149,7 @@
           executeCVS( workingDirectory, arguments );
   
           // Check the updated files
  -        result = scmManager.update( scmRepository, assertionDirectory, null );
  +        result = scmManager.update( scmRepository, new ScmFileSet( assertionDirectory ),
null );
   
           assertNotNull( result );
   
  
  
  
  1.2       +3 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CheckOutCommandTckTest.java	9 Nov 2004 15:28:57 -0000	1.1
  +++ CheckOutCommandTckTest.java	24 Dec 2004 01:21:35 -0000	1.2
  @@ -24,6 +24,7 @@
   
   import org.apache.maven.scm.ScmTestCase;
   import org.apache.maven.scm.ScmFile;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.checkout.CheckOutScmResult;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.repository.ScmRepository;
  @@ -121,7 +122,7 @@
           // Execute
           // ----------------------------------------------------------------------
   
  -        CheckOutScmResult result = scmManager.checkOut( repository, workingDirectory, tag
);
  +        CheckOutScmResult result = scmManager.checkOut( repository, new ScmFileSet( workingDirectory
), tag );
   
           // ----------------------------------------------------------------------
           // Assert
  
  
  
  1.2       +3 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UpdateCommandTckTest.java	9 Nov 2004 15:28:57 -0000	1.1
  +++ UpdateCommandTckTest.java	24 Dec 2004 01:21:35 -0000	1.2
  @@ -24,6 +24,7 @@
   import org.apache.maven.scm.ScmFile;
   import org.apache.maven.scm.ScmFileStatus;
   import org.apache.maven.scm.ScmTestCase;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.update.UpdateScmResult;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.repository.ScmRepository;
  @@ -197,7 +198,7 @@
           // Update the project
           // ----------------------------------------------------------------------
   
  -        UpdateScmResult result = scmManager.update( scmRepository, getUpdatingCopy(), null
);
  +        UpdateScmResult result = scmManager.update( scmRepository, new ScmFileSet( getUpdatingCopy()
), null );
   
           assertNotNull( "The command returned a null result.", result );
   
  
  
  

Mime
View raw message