You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ep...@apache.org on 2006/05/05 08:07:20 UTC
svn commit: r399980 - in
/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly:
AssemblyMojoTest.java stubs/ArtifactStub.java
Author: epunzalan
Date: Thu May 4 23:07:20 2006
New Revision: 399980
URL: http://svn.apache.org/viewcvs?rev=399980&view=rev
Log:
fix a failing test from prev commit
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/stubs/ArtifactStub.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java?rev=399980&r1=399979&r2=399980&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 Thu May 4 23:07:20 2006
@@ -167,18 +167,27 @@
{
Artifact dependency = (Artifact) artifacts.next();
- String name = dependency.getArtifactId() + "-" + dependency.getVersion();
+ String name = dependency.getArtifactId() + "-" + dependency.getVersion() + "." + dependency.getType();
File workPath = new File( workDir, name );
+ System.out.println( "WORK PATH: " + workPath.getAbsolutePath() );
+
assertTrue( "Test if expected dependency is unpacked", workPath.exists() && workPath.isDirectory() );
assertTrue( "Test if expected dependency is in the archive", archivedFileSet.contains( workPath ) );
}
- String name = project.getArtifact().getArtifactId() + "-" + project.getArtifact().getVersion();
+ String name = project.getArtifact().getArtifactId() + "-" + project.getArtifact().getVersion() +
+ "." + project.getArtifact().getType();
File workPath = new File( workDir, name );
assertTrue( "Test if project is unpacked", workPath.exists() && workPath.isDirectory() );
assertTrue( "Test if project is in the archive", archivedFileSet.contains( workPath ) );
+ }
+
+ public void testFileSet()
+ throws Exception
+ {
+ AssemblyMojo mojo = executeMojo( "fileSet-plugin-config.xml" );
}
private AssemblyMojo getMojo( String pluginXml )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java?rev=399980&r1=399979&r2=399980&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java Thu May 4 23:07:20 2006
@@ -32,7 +32,7 @@
public ArtifactStub( String groupId, String artifactId, String version, String packaging, String scope )
{
super( groupId, artifactId, VersionRange.createFromVersion( version ), scope, packaging,
- null, new DefaultArtifactHandler(), false );
+ null, new DefaultArtifactHandler( packaging ), false );
}
public File getFile()