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/08/04 00:14:27 UTC
svn commit: r982051 - /maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java

Author: olamy
Date: Tue Aug  3 22:14:26 2010
New Revision: 982051

URL: http://svn.apache.org/viewvc?rev=982051&view=rev
Log:
fix intermittent failure on my solaris box

Modified:
    maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java

Modified: maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java?rev=982051&r1=982050&r2=982051&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java (original)
+++ maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java Tue Aug  3 22:14:26 2010
@@ -54,6 +54,7 @@ public class CheckoutMojoTest
     public void testSkipCheckoutWhenCheckoutDirectoryExistsAndSkip()
         throws Exception
     {
+        FileUtils.forceDelete( checkoutDir );
         checkoutDir.mkdirs();
 
         CheckoutMojo mojo = (CheckoutMojo) lookupMojo( "checkout", getTestFile(
@@ -76,6 +77,8 @@ public class CheckoutMojoTest
             return;
         }
 
+        FileUtils.forceDelete( checkoutDir );
+        
         SvnScmTestUtils.initializeRepository( repository );
 
         CheckoutMojo mojo = (CheckoutMojo) lookupMojo( "checkout", getTestFile(
@@ -95,6 +98,9 @@ public class CheckoutMojoTest
     public void testSkipCheckoutWithoutConnectionUrl()
         throws Exception
     {
+        FileUtils.forceDelete( checkoutDir );
+        
+        checkoutDir.mkdirs();
         CheckoutMojo mojo = (CheckoutMojo) lookupMojo( "checkout", getTestFile(
             "src/test/resources/mojos/checkout/checkoutWithoutConnectionUrl.xml" ) );
 
@@ -113,6 +119,8 @@ public class CheckoutMojoTest
     public void testUseExport()
         throws Exception
     {
+        FileUtils.forceDelete( checkoutDir );
+        
         checkoutDir.mkdirs();
 
         CheckoutMojo mojo = (CheckoutMojo) lookupMojo( "checkout", getTestFile(
@@ -129,8 +137,14 @@ public class CheckoutMojoTest
     public void testExcludeInclude()
         throws Exception
     {
+try
+{
+        FileUtils.forceDelete( checkoutDir );
+        
         checkoutDir.mkdirs();
 
+        SvnScmTestUtils.initializeRepository( repository );
+
         CheckoutMojo mojo = (CheckoutMojo) lookupMojo(
                                                        "checkout",
                                                        getTestFile( "src/test/resources/mojos/checkout/checkoutWithExcludesIncludes.xml" ) );
@@ -147,6 +161,11 @@ public class CheckoutMojoTest
         assertTrue( new File( checkoutDir, "src/main/java" ).exists() );
         assertTrue( new File( checkoutDir, "src/main/java/.svn" ).exists() );
         assertTrue( new File( checkoutDir, "src/main/.svn" ).exists() );
+} catch (Exception e)
+{
+  e.printStackTrace();
+  throw e;
+}
     }
     
 }