Author: dantran
Date: Wed May 17 15:16:53 2006
New Revision: 407389
URL: http://svn.apache.org/viewvc?rev=407389&view=rev
Log:
fixed test failures on second try, submitted by Richard van der Hoff in
MASSEMBLY-88
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/directory/min-plugin-config.xml
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java?rev=407389&r1=407388&r2=407389&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
Wed May 17 15:16:53 2006
@@ -1316,7 +1316,16 @@
private void generateTestFileSets( String lineEnding )
throws Exception
{
+ generateTestFileSets( basedir, lineEnding );
+ }
+
+ static void generateTestFileSets( String basedir, String lineEnding )
+ throws Exception
+ {
String fileSetDir = basedir + "/target/test-classes/fileSet";
+
+ /* ensure that we start with a fresh dir, else we get all manner of
dross from other tests */
+ FileUtils.deleteDirectory(fileSetDir);
FileUtils.mkdir( fileSetDir + "/configs" );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java?rev=407389&r1=407388&r2=407389&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java
Wed May 17 15:16:53 2006
@@ -53,6 +53,8 @@
assertNotNull( mojo );
+ AssemblyMojoTest.generateTestFileSets(getBasedir(), "\n");
+
mojo.execute();
Map filesArchived = ArchiverManagerStub.archiverStub.getFiles();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/directory/min-plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/directory/min-plugin-config.xml?rev=407389&r1=407388&r2=407389&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/directory/min-plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/directory/min-plugin-config.xml
Wed May 17 15:16:53 2006
@@ -19,7 +19,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
-
<descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
+
<descriptor>${basedir}/src/test/resources/assemblies/fileSet.xml</descriptor>
<basedir>${basedir}</basedir>
<project
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"
/>
<executedProject
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"
/>
