Return-Path: Delivered-To: apmail-maven-scm-cvs-archive@www.apache.org Received: (qmail 16146 invoked from network); 2 Nov 2004 22:00:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 2 Nov 2004 22:00:04 -0000 Received: (qmail 76631 invoked by uid 500); 2 Nov 2004 21:59:37 -0000 Delivered-To: apmail-maven-scm-cvs-archive@maven.apache.org Received: (qmail 76513 invoked by uid 500); 2 Nov 2004 21:59:36 -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 76402 invoked by uid 99); 2 Nov 2004 21:59:34 -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; Tue, 02 Nov 2004 13:59:33 -0800 Received: (qmail 14960 invoked by uid 1849); 2 Nov 2004 21:58:30 -0000 Date: 2 Nov 2004 21:58:30 -0000 Message-ID: <20041102215830.14959.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 ScmTestCase.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N trygvis 2004/11/02 13:58:30 Modified: maven-scm-api/src/main/java/org/apache/maven/scm ScmTestCase.java Log: o Adding a generic ScmResult assertion. Revision Changes Path 1.7 +36 -19 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ScmTestCase.java 31 Oct 2004 14:12:11 -0000 1.6 +++ ScmTestCase.java 2 Nov 2004 21:58:30 -0000 1.7 @@ -17,20 +17,19 @@ */ import java.io.File; -import java.io.IOException; import java.io.FileWriter; +import java.io.IOException; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.repository.ScmRepository; -import junit.framework.TestCase; - import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.cli.CommandLineUtils; -import org.codehaus.plexus.util.cli.Commandline; import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer; +import org.codehaus.plexus.util.cli.Commandline; +import junit.framework.TestCase; /** * @author Jason van Zyl @@ -77,6 +76,38 @@ } // ---------------------------------------------------------------------- + // Assertions + // ---------------------------------------------------------------------- + + public void assertPath( String expectedPath, String actualPath ) + throws Exception + { + assertEquals( StringUtils.replace( expectedPath, "\\", "/" ), StringUtils.replace( expectedPath, "\\", "/" ) ); + } + + public void assertResultIsSuccess( ScmResult result ) + { + if ( result.isSuccess() ) + { + return; + } + + System.err.println( "----------------------------------------------------------------------" ); + System.err.println( "Provider message" ); + System.err.println( "----------------------------------------------------------------------" ); + System.err.println( result.getProviderMessage() ); + System.err.println( "----------------------------------------------------------------------" ); + + System.err.println( "----------------------------------------------------------------------" ); + System.err.println( "Command output" ); + System.err.println( "----------------------------------------------------------------------" ); + System.err.println( result.getCommandOutput() ); + System.err.println( "----------------------------------------------------------------------" ); + + fail( "The check out result success flag was false." ); + } + + // ---------------------------------------------------------------------- // Utility Methods // ---------------------------------------------------------------------- @@ -138,20 +169,6 @@ fail( "Exit value wasn't 0, was:" + exitValue ); } } - - // ---------------------------------------------------------------------- - // Assertions - // ---------------------------------------------------------------------- - - protected void assertPath( String expectedPath, String actualPath ) - throws Exception - { - assertEquals( StringUtils.replace( expectedPath, "\\", "/" ), StringUtils.replace( expectedPath, "\\", "/" ) ); - } - - // ---------------------------------------------------------------------- - // Util methods - // ---------------------------------------------------------------------- public static void makeDirectory( File basedir, String fileName ) {