Return-Path: Delivered-To: apmail-maven-scm-cvs-archive@www.apache.org Received: (qmail 24710 invoked from network); 29 Oct 2004 11:44:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 29 Oct 2004 11:44:05 -0000 Received: (qmail 38012 invoked by uid 500); 29 Oct 2004 11:43:35 -0000 Delivered-To: apmail-maven-scm-cvs-archive@maven.apache.org Received: (qmail 37968 invoked by uid 500); 29 Oct 2004 11:43:34 -0000 Mailing-List: contact scm-cvs-help@maven.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: scm-cvs@maven.apache.org Delivered-To: mailing list scm-cvs@maven.apache.org Received: (qmail 37891 invoked by uid 99); 29 Oct 2004 11:43:33 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 29 Oct 2004 04:43:29 -0700 Received: (qmail 24426 invoked by uid 1849); 29 Oct 2004 11:43:28 -0000 Date: 29 Oct 2004 11:43:28 -0000 Message-ID: <20041029114328.24425.qmail@minotaur.apache.org> From: trygvis@apache.org To: maven-scm-cvs@apache.org Subject: cvs commit: maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin AbstractCheckInCommand.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N trygvis 2004/10/29 04:43:28 Modified: maven-scm-api/src/main/java/org/apache/maven/scm ScmFile.java ScmTestCase.java maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin AbstractCheckInCommand.java Log: o Adding some utility methods for creating files for testing. o Adding a toString() method on the ScmFile for easier debugging. Revision Changes Path 1.3 +6 -1 maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java Index: ScmFile.java =================================================================== RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ScmFile.java 26 Oct 2004 12:37:05 -0000 1.2 +++ ScmFile.java 29 Oct 2004 11:43:27 -0000 1.3 @@ -71,4 +71,9 @@ { return path.hashCode(); } + + public String toString() + { + return "[" + path + ":" + status + "]"; + } } 1.4 +42 -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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ScmTestCase.java 28 Oct 2004 23:26:47 -0000 1.3 +++ ScmTestCase.java 29 Oct 2004 11:43:27 -0000 1.4 @@ -17,6 +17,8 @@ */ import java.io.File; +import java.io.IOException; +import java.io.FileWriter; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.repository.ScmRepository; @@ -142,5 +144,44 @@ throws Exception { assertEquals( StringUtils.replace( expectedPath, "\\", "/" ), StringUtils.replace( expectedPath, "\\", "/" ) ); + } + + // ---------------------------------------------------------------------- + // Util methods + // ---------------------------------------------------------------------- + + public static void makeDirectory( File basedir, String fileName ) + { + File dir = new File( basedir, fileName ); + + if ( !dir.exists() ) + { + assertTrue( dir.mkdirs() ); + } + } + + public static void makeFile( File basedir, String fileName ) + throws IOException + { + makeFile( basedir, fileName, fileName ); + } + + public static void makeFile( File basedir, String fileName, String contents ) + throws IOException + { + File file = new File( basedir, fileName ); + + File parent = file.getParentFile(); + + if ( !parent.exists() ) + { + assertTrue( parent.mkdirs() ); + } + + FileWriter writer = new FileWriter( file ); + + writer.write( contents ); + + writer.close(); } } 1.3 +1 -4 maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java Index: AbstractCheckInCommand.java =================================================================== RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractCheckInCommand.java 26 Oct 2004 12:37:05 -0000 1.2 +++ AbstractCheckInCommand.java 29 Oct 2004 11:43:28 -0000 1.3 @@ -25,9 +25,6 @@ import org.apache.maven.scm.command.AbstractCommand; import org.apache.maven.scm.provider.ScmProviderRepository; - - - /** * @author Emmanuel Venisse * @author Trygve Laugstøl