Author: jdcasey
Date: Tue Aug 8 14:57:45 2006
New Revision: 429843
URL: http://svn.apache.org/viewvc?rev=429843&view=rev
Log:
Added a new functional test for unpacked dependency sets.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/verify.bsh
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/pom.xml?rev=429843&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/pom.xml
Tue Aug 8 14:57:45 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>dependencySet-unpacked</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <name>Maven Quick Start Archetype</name>
+ <version>1.0-SNAPSHOT</version>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/main/java/test/App.java?rev=429843&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/main/java/test/App.java
Tue Aug 8 14:57:45 2006
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/test/java/test/AppTest.java?rev=429843&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/test/java/test/AppTest.java
Tue Aug 8 14:57:45 2006
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child1/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/pom.xml?rev=429843&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/pom.xml
Tue Aug 8 14:57:45 2006
@@ -0,0 +1,47 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>dependencySet-unpacked</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>child2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-binary-assembly</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/assemble/bin.xml?rev=429843&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/assemble/bin.xml
Tue Aug 8 14:57:45 2006
@@ -0,0 +1,21 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>test:child1</include>
+ </includes>
+ <unpack>true</unpack>
+ <outputDirectory>/</outputDirectory>
+ <outputFileNameMapping>${artifactId}</outputFileNameMapping>
+ <scope>test</scope>
+ <excludes>
+ <exclude>junit:junit</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/main/java/test/App.java?rev=429843&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/main/java/test/App.java
Tue Aug 8 14:57:45 2006
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/test/java/test/AppTest.java?rev=429843&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/test/java/test/AppTest.java
Tue Aug 8 14:57:45 2006
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/child2/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/goals.txt?rev=429843&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/goals.txt
Tue Aug 8 14:57:45 2006
@@ -0,0 +1 @@
+package
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/pom.xml?rev=429843&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/pom.xml
Tue Aug 8 14:57:45 2006
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>dependencySet-unpacked</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/verify.bsh?rev=429843&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/basic-features/dependencySet-unpacked/verify.bsh
Tue Aug 8 14:57:45 2006
@@ -0,0 +1,48 @@
+import java.io.*;
+import java.net.*;
+import java.util.jar.*;
+
+boolean result = true;
+
+try
+{
+ System.out.println( "Creating JarFile java.io.File." );
+
+ File jarFile = new File( basedir,
"child2/target/child2-1.0-SNAPSHOT-bin.jar" );
+
+ System.out.println( "Checking for existence and file-ishness of: " +
jarFile );
+
+ if ( !jarFile.exists() || jarFile.isDirectory() )
+ {
+ System.err.println( "jar file is missing or a directory." );
+ return false;
+ }
+
+ System.out.println( "Creating JarFile instance." );
+
+ JarFile jf = new JarFile( jarFile );
+
+ System.out.println( "Looking for 'child1/' jar entry." );
+
+ if ( jf.getEntry( "child1/" ) == null )
+ {
+ System.err.println( "child1 entry is missing." );
+ result = false;
+ }
+
+ System.out.println( "Looking for absence of 'junit/' jar entry." );
+
+ if ( jf.getEntry( "junit" ) != null )
+ {
+ System.err.println( "junit jar should not be present." );
+ result = false;
+ }
+
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java?rev=429843&r1=429842&r2=429843&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
Tue Aug 8 14:57:45 2006
@@ -56,6 +56,11 @@
if ( unpack )
{
+ if ( !outputLocation.endsWith( "/" ) )
+ {
+ outputLocation += "/";
+ }
+
String[] includesArray = TypeConversionUtils.toStringArray(
includes );
String[] excludesArray = TypeConversionUtils.toStringArray(
excludes );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java?rev=429843&r1=429842&r2=429843&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
Tue Aug 8 14:57:45 2006
@@ -90,6 +90,11 @@
{
value += "/";
}
+
+ if ( value.length() > 0 && ( value.startsWith( "/" ) ||
value.startsWith( "\\" ) ) )
+ {
+ value = value.substring( 1 );
+ }
return value;
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java?rev=429843&r1=429842&r2=429843&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
Tue Aug 8 14:57:45 2006
@@ -55,7 +55,7 @@
macTask.expectGetClassifier( null );
macTask.expectGetArtifactHandler();
- macTask.expectAddFile( outputLocation + "/artifact", 8 );
+ macTask.expectAddFile( "out/artifact", 8 );
project.setArtifacts( Collections.singleton( macTask.artifact ) );
@@ -118,13 +118,13 @@
public void
testAddDependencySet_ShouldAddOneDependencyFromProjectWithoutUnpacking()
throws AssemblyFormattingException, ArchiveCreationException,
IOException
{
- verifyOneDependencyAdded( "/out", false );
+ verifyOneDependencyAdded( "out", false );
}
public void
testAddDependencySet_ShouldAddOneDependencyFromProjectUnpacked()
throws AssemblyFormattingException, ArchiveCreationException,
IOException
{
- verifyOneDependencyAdded( "/out", true );
+ verifyOneDependencyAdded( "out", true );
}
private void verifyOneDependencyAdded( String outputLocation, boolean
unpack )
@@ -150,7 +150,7 @@
if ( unpack )
{
- macTask.expectAddArchivedFileSet( outputLocation + "/artifact",
null, null );
+ macTask.expectAddArchivedFileSet( outputLocation + "/artifact/",
null, null );
macTask.expectModeChange( -1, -1, 8, 8, 2 );
}
else
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java?rev=429843&r1=429842&r2=429843&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
Tue Aug 8 14:57:45 2006
@@ -61,7 +61,7 @@
{
mac.expectModeChange( -1, -1, -1, -1, 1 );
- String outputLocation = "artifact";
+ String outputLocation = "artifact/";
try
{
@@ -91,7 +91,7 @@
mac.expectModeChange( -1, -1, directoryMode, fileMode, 2 );
- String outputLocation = "artifact";
+ String outputLocation = "artifact/";
try
{
@@ -120,7 +120,7 @@
{
mac.expectModeChange( -1, -1, -1, -1, 1 );
- String outputLocation = "artifact";
+ String outputLocation = "artifact/";
String[] includes = { "**/*.txt" };
String[] excludes = { "**/README.txt" };
