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-providers/maven-scm-provider-svn/src/test/resources/tck tck.dump checkout.dump update.dump
Date Mon, 03 Jan 2005 02:04:08 GMT
brett       2005/01/02 18:04:08

  Modified:    maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkin
                        SvnCheckInCommand.java SvnCheckInConsumer.java
               maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkout
                        SvnCheckOutCommandTckTest.java
               maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/update
                        SvnUpdateCommandTckTest.java
  Added:       maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkin
                        SvnCheckInCommandTckTest.java
               maven-scm-providers/maven-scm-provider-svn/src/test/resources/tck
                        tck.dump
  Removed:     maven-scm-providers/maven-scm-provider-svn/src/test/resources/tck
                        checkout.dump update.dump
  Log:
  svn TCK cleanup and corrections
  
  Revision  Changes    Path
  1.3       +2 -2      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkin/SvnCheckInCommand.java
  
  Index: SvnCheckInCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkin/SvnCheckInCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SvnCheckInCommand.java	24 Dec 2004 03:04:47 -0000	1.2
  +++ SvnCheckInCommand.java	3 Jan 2005 02:04:08 -0000	1.3
  @@ -66,7 +66,7 @@
   
           Commandline cl = createCommandLine( (SvnScmProviderRepository) repo, fileSet.getBasedir(),
messageFile );
   
  -        SvnCheckInConsumer consumer = new SvnCheckInConsumer( getLogger(), fileSet.getBasedir().getParentFile()
);
  +        SvnCheckInConsumer consumer = new SvnCheckInConsumer( getLogger(), fileSet.getBasedir()
);
   
           CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
   
  
  
  
  1.3       +10 -5     maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkin/SvnCheckInConsumer.java
  
  Index: SvnCheckInConsumer.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkin/SvnCheckInConsumer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SvnCheckInConsumer.java	24 Dec 2004 03:04:47 -0000	1.2
  +++ SvnCheckInConsumer.java	3 Jan 2005 02:04:08 -0000	1.3
  @@ -34,6 +34,8 @@
   {
       private final static String SENDING_TOKEN = "Sending        ";
   
  +    private final static String ADDING_TOKEN = "Adding         ";
  +
       private final static String TRANSMITTING_TOKEN = "Transmitting file data";
   
       private final static String COMMITTED_REVISION_TOKEN = "Committed revision";
  @@ -70,9 +72,7 @@
               return;
           }
   
  -        String statusString = line.substring( 0, 1 );
  -
  -        String file = line.substring( 3 );
  +        String file;
   
           if ( line.startsWith( COMMITTED_REVISION_TOKEN ) )
           {
  @@ -86,13 +86,18 @@
           {
               file = line.substring( SENDING_TOKEN.length() );
           }
  +        else if ( line.startsWith( ADDING_TOKEN ) )
  +        {
  +            file = line.substring( ADDING_TOKEN.length() );
  +        }
           else if ( line.startsWith( TRANSMITTING_TOKEN ) )
           {
               // ignore
  +            return;
           }
           else
           {
  -            logger.info( "Unknown file status: '" + statusString + "'." );
  +            logger.info( "Unknown line: '" + line + "'" );
   
               return;
           }
  
  
  
  1.1                  maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkin/SvnCheckInCommandTckTest.java
  
  Index: SvnCheckInCommandTckTest.java
  ===================================================================
  package org.apache.maven.scm.provider.svn.command.checkin;
  
  /*
   * Copyright 2003-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.
   */
  
  import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
  import org.apache.maven.scm.tck.command.checkin.CheckInCommandTckTest;
  
  import java.io.File;
  
  /**
   * @author <a href="mailto:brett@apache.org">Brett Porter</a>
   * @version $Id: SvnCheckInCommandTckTest.java,v 1.1 2005/01/03 02:04:08 brett Exp $
   */
  public class SvnCheckInCommandTckTest extends CheckInCommandTckTest
  {
      private final static File checkinDump = getTestFile( "src/test/resources/tck/tck.dump"
);
  
      public String getScmUrl()
          throws Exception
      {
          return SvnScmTestUtils.getScmUrl( getRepositoryRoot() );
      }
  
      public void initRepo()
          throws Exception
      {
          SvnScmTestUtils.initializeRepository( getRepositoryRoot(), checkinDump );
      }
  }
  
  
  
  1.5       +2 -2      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommandTckTest.java
  
  Index: SvnCheckOutCommandTckTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommandTckTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SvnCheckOutCommandTckTest.java	24 Dec 2004 03:04:47 -0000	1.4
  +++ SvnCheckOutCommandTckTest.java	3 Jan 2005 02:04:08 -0000	1.5
  @@ -35,6 +35,6 @@
       public void initRepo()
           throws Exception
       {
  -        SvnScmTestUtils.initializeRepository( getRepositoryRoot(), getTestFile( "src/test/resources/tck/checkout.dump"
) );
  +        SvnScmTestUtils.initializeRepository( getRepositoryRoot(), getTestFile( "src/test/resources/tck/tck.dump"
) );
       }
   }
  
  
  
  1.7       +2 -2      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateCommandTckTest.java
  
  Index: SvnUpdateCommandTckTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateCommandTckTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SvnUpdateCommandTckTest.java	30 Dec 2004 10:05:29 -0000	1.6
  +++ SvnUpdateCommandTckTest.java	3 Jan 2005 02:04:08 -0000	1.7
  @@ -28,7 +28,7 @@
   public class SvnUpdateCommandTckTest
       extends UpdateCommandTckTest
   {
  -    private final static File updateDump = getTestFile( "src/test/resources/tck/update.dump"
);
  +    private final static File updateDump = getTestFile( "src/test/resources/tck/tck.dump"
);
   
       public String getScmUrl()
           throws Exception
  
  
  
  1.1                  maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/resources/tck/tck.dump
  
  Index: tck.dump
  ===================================================================
  SVN-fs-dump-format-version: 2
  
  UUID: 32329737-c6e7-0310-acdd-fde163f827b2
  
  Revision-number: 0
  Prop-content-length: 56
  Content-length: 56
  
  K 8
  svn:date
  V 27
  2004-10-31T22:57:32.330365Z
  PROPS-END
  
  Revision-number: 1
  Prop-content-length: 101
  Content-length: 101
  
  K 7
  svn:log
  V 0
  
  K 10
  svn:author
  V 7
  trygvis
  K 8
  svn:date
  V 27
  2004-10-31T23:00:31.108377Z
  PROPS-END
  
  Node-path: file
  Node-kind: file
  Node-action: add
  Prop-content-length: 10
  Text-content-length: 0
  Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
  Content-length: 10
  
  PROPS-END
  
  
  Revision-number: 2
  Prop-content-length: 101
  Content-length: 101
  
  K 7
  svn:log
  V 0
  
  K 10
  svn:author
  V 7
  trygvis
  K 8
  svn:date
  V 27
  2004-10-31T23:01:07.427469Z
  PROPS-END
  
  Node-path: file_2
  Node-kind: file
  Node-action: add
  Prop-content-length: 10
  Text-content-length: 0
  Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
  Content-length: 10
  
  PROPS-END
  
  
  Revision-number: 3
  Prop-content-length: 101
  Content-length: 101
  
  K 7
  svn:log
  V 0
  
  K 10
  svn:author
  V 7
  trygvis
  K 8
  svn:date
  V 27
  2004-10-31T23:01:47.729957Z
  PROPS-END
  
  Node-path: file_1
  Node-kind: file
  Node-action: add
  Node-copyfrom-rev: 1
  Node-copyfrom-path: file
  
  
  Node-path: file_2
  Node-kind: file
  Node-action: change
  Text-content-length: 17
  Text-content-md5: 53adcdeed5651fafe46fbba6b5e87d02
  Content-length: 17
  
  adding some crap
  
  
  Node-path: file
  Node-action: delete
  
  
  Revision-number: 4
  Prop-content-length: 118
  Content-length: 118
  
  K 7
  svn:log
  V 16
  o My log message
  K 10
  svn:author
  V 7
  trygvis
  K 8
  svn:date
  V 27
  2004-11-01T07:34:03.254229Z
  PROPS-END
  
  Node-path: file_2
  Node-kind: file
  Node-action: change
  Text-content-length: 102
  Text-content-md5: 12db6e90dbaccb1e1c793465d0cd2573
  Content-length: 102
  
  adding some crap
  adding some crap
  adding some crap
  adding some crap
  adding some crap
  adding some crap
  
  
  Revision-number: 5
  Prop-content-length: 127
  Content-length: 127
  
  K 7
  svn:log
  V 25
  o Making TCK update dump.
  K 10
  svn:author
  V 7
  trygvis
  K 8
  svn:date
  V 27
  2004-11-03T09:40:38.812597Z
  PROPS-END
  
  Node-path: pom.xml
  Node-kind: file
  Node-action: add
  Prop-content-length: 10
  Text-content-length: 8
  Text-content-md5: bb4d26f6cff04ea8d4453055155aa4ae
  Content-length: 18
  
  PROPS-END
  pom.xml
  
  
  Node-path: readme.txt
  Node-kind: file
  Node-action: add
  Prop-content-length: 10
  Text-content-length: 11
  Text-content-md5: 2f4e912cdd8e4daf724d86c85100c234
  Content-length: 21
  
  PROPS-END
  readme.txt
  
  
  Node-path: src
  Node-kind: dir
  Node-action: add
  Prop-content-length: 10
  Content-length: 10
  
  PROPS-END
  
  
  Node-path: src/main
  Node-kind: dir
  Node-action: add
  Prop-content-length: 10
  Content-length: 10
  
  PROPS-END
  
  
  Node-path: src/main/java
  Node-kind: dir
  Node-action: add
  Prop-content-length: 10
  Content-length: 10
  
  PROPS-END
  
  
  Node-path: src/main/java/Application.java
  Node-kind: file
  Node-action: add
  Prop-content-length: 10
  Text-content-length: 17
  Text-content-md5: f9c80174d0aceb15241396719d3d8ee0
  Content-length: 27
  
  PROPS-END
  Application.java
  
  
  Node-path: src/test
  Node-kind: dir
  Node-action: add
  Prop-content-length: 10
  Content-length: 10
  
  PROPS-END
  
  
  Node-path: src/test/java
  Node-kind: dir
  Node-action: add
  Prop-content-length: 10
  Content-length: 10
  
  PROPS-END
  
  
  Node-path: src/test/java/Test.java
  Node-kind: file
  Node-action: add
  Prop-content-length: 10
  Text-content-length: 10
  Text-content-md5: 2b67cb187cfebc6556a9ff00dd2a73c9
  Content-length: 20
  
  PROPS-END
  Test.java
  
  
  Node-path: src/test/resources
  Node-kind: dir
  Node-action: add
  Prop-content-length: 10
  Content-length: 10
  
  PROPS-END
  
  
  Node-path: file_1
  Node-action: delete
  
  
  Node-path: file_2
  Node-action: delete
  
  
  Revision-number: 6
  Prop-content-length: 135
  Content-length: 135
  
  K 7
  svn:log
  V 33
  o Making TCK update dump, take 2.
  K 10
  svn:author
  V 7
  trygvis
  K 8
  svn:date
  V 27
  2004-11-03T09:55:45.739689Z
  PROPS-END
  
  Node-path: pom.xml
  Node-kind: file
  Node-action: change
  Text-content-length: 9
  Text-content-md5: ab43bf43c516ba05e7ea14237861c101
  Content-length: 9
  
  /pom.xml
  
  
  Node-path: readme.txt
  Node-kind: file
  Node-action: change
  Text-content-length: 12
  Text-content-md5: 2c15d78f5fc4223fccc94031588aee97
  Content-length: 12
  
  /readme.txt
  
  
  Node-path: src/main/java/Application.java
  Node-kind: file
  Node-action: change
  Text-content-length: 32
  Text-content-md5: e0b1aa4c95b4211d51a817c43f6a0070
  Content-length: 32
  
  /src/main/java/Application.java
  
  
  Node-path: src/test/java/Test.java
  Node-kind: file
  Node-action: change
  Text-content-length: 25
  Text-content-md5: 2f8ba3ce8330bf354a73b4f243013e98
  Content-length: 25
  
  /src/test/java/Test.java
  
  
  Revision-number: 7
  Prop-content-length: 135
  Content-length: 135
  
  K 7
  svn:log
  V 33
  o Making TCK update dump, take 3.
  K 10
  svn:author
  V 7
  trygvis
  K 8
  svn:date
  V 27
  2004-11-03T09:57:42.448827Z
  PROPS-END
  
  Node-path: pom.xml
  Node-kind: file
  Node-action: change
  Text-content-length: 8
  Text-content-md5: eab74e9a6a0a7669ca7a253f0f0ed832
  Content-length: 8
  
  /pom.xml
  
  Node-path: readme.txt
  Node-kind: file
  Node-action: change
  Text-content-length: 11
  Text-content-md5: 74088de3393a22eb8d6abc87369fb21a
  Content-length: 11
  
  /readme.txt
  
  Node-path: src/main/java/Application.java
  Node-kind: file
  Node-action: change
  Text-content-length: 31
  Text-content-md5: 1486dc4cd4c38fc1d4c2b4ae40f87a3e
  Content-length: 31
  
  /src/main/java/Application.java
  
  Node-path: src/test/java/Test.java
  Node-kind: file
  Node-action: change
  Text-content-length: 24
  Text-content-md5: 197e3f681c57ea737fdd1b73e83509b1
  Content-length: 24
  
  /src/test/java/Test.java
  
  
  
  

Mime
View raw message