svn commit: r596872 - in /maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test: ArchetypeGenerationTest.java ArchetyperRoundtripTest.java ArchetyperRoundtripWithProxyTest.java

[rafale]

Author: rafale
Date: Tue Nov 20 15:12:44 2007
New Revision: 596872

URL: http://svn.apache.org/viewvc?rev=596872&view=rev
Log:
Ensures empty directories for testing

Modified:
    
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
    
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
    
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java

Modified: 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java?rev=596872&r1=596871&r2=596872&view=diff
==============================================================================
--- 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
 (original)
+++ 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
 Tue Nov 20 15:12:44 2007
@@ -29,6 +29,8 @@
 import java.io.File;
 import java.util.List;
 import java.util.Properties;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
 
 /** @author Jason van Zyl */
 public class ArchetypeGenerationTest
@@ -76,10 +78,11 @@
         String packageName = "org.mycompany.app";
 
         // With the selected OldArchetype and the parameters you can create a 
generation request as follows:
-
+        File outputDirectory = new File( getBasedir(), 
"target/test-classes/projects/archetyper-generate-1" );
+        FileUtils.forceDelete(outputDirectory);
+        
         ArchetypeGenerationRequest agr = new ArchetypeGenerationRequest( 
selection )
-            .setOutputDirectory( new File( getBasedir(),
-                "target/test-classes/projects/archetyper-generate-1" 
).getAbsolutePath() )
+            .setOutputDirectory( outputDirectory.getAbsolutePath() )
             .setLocalRepository( localRepository )
             .setGroupId( groupId )
             .setArtifactId( artifactId )

Modified: 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java?rev=596872&r1=596871&r2=596872&view=diff
==============================================================================
--- 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
 (original)
+++ 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
 Tue Nov 20 15:12:44 2007
@@ -95,6 +95,7 @@
 
         File workingProject = new File( getBasedir(),
             "target/test-classes/projects/roundtrip-1-project" );
+        FileUtils.forceDelete(new File(workingProject, "target"));
 
         // (2) create an archetype from the project
         File pom = new File( workingProject, "pom.xml" );
@@ -170,6 +171,7 @@
         // (6) create a project form the archetype we just created
         String outputDirectory = new File( getBasedir(),
             "target/test-classes/projects/roundtrip-1-recreatedproject" 
).getAbsolutePath();
+        FileUtils.forceDelete(outputDirectory);
 
         ArchetypeGenerationRequest agr =
             new ArchetypeGenerationRequest().setArchetypeGroupId(

Modified: 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java?rev=596872&r1=596871&r2=596872&view=diff
==============================================================================
--- 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
 (original)
+++ 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
 Tue Nov 20 15:12:44 2007
@@ -94,6 +94,7 @@
 
         File workingProject = new File( getBasedir(),
             "target/test-classes/projects/roundtrip-2-project" );
+        FileUtils.forceDelete(new File(workingProject, "target"));
 
         // (2) create an archetype from the project
         File pom = new File( workingProject, "pom.xml" );
@@ -169,6 +170,7 @@
         // (6) create a project form the archetype we just created
         String outputDirectory = new File( getBasedir(),
             "target/test-classes/projects/roundtrip-2-recreatedproject" 
).getAbsolutePath();
+        FileUtils.forceDelete(outputDirectory);
 
         WagonManager manager = (WagonManager) lookup(WagonManager.class);
         manager.addProxy("http", "localhost", 18882, null, null, null);