You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ke...@apache.org on 2006/12/22 13:19:35 UTC

svn commit: r489633 - /maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java

Author: kenney
Date: Fri Dec 22 04:19:34 2006
New Revision: 489633

URL: http://svn.apache.org/viewvc?view=rev&rev=489633
Log:
PR: MASSEMBLY-118: fileItem/outputDirectory resolved with cwd, not project basedir
Submitted by: Baerrach bonDierne
Reviewed by: Kenney Westerhof

This issue is already resolved, but this issue had a patch for 2 JUnit tests that explicitly
test for this case. Added the tests.

Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java

Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java?view=diff&rev=489633&r1=489632&r2=489633
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java Fri Dec 22 04:19:34 2006
@@ -145,6 +145,213 @@
         mm.verifyAll();
     }
 
+    public void testExecute_WithOutputDirectory()
+        throws Exception
+    {
+        MockManager mm = new MockManager();
+
+        MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
+
+        File basedir = fileManager.createTempDir();
+
+        File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
+        File licenseFile = fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
+        File configFile = fileManager.createFile( basedir, "config/config.txt", "This is a test file for config/config.txt" );
+
+        macCS.expectGetBasedir( basedir );
+
+        File tempRoot = fileManager.createTempDir();
+
+        macCS.expectGetTemporaryRootDirectory( tempRoot );
+
+        macCS.expectGetProject( new MavenProject( new Model() ) );
+
+        macCS.expectGetFinalName( "final-name" );
+
+        MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
+
+        MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
+
+        Assembly assembly = new Assembly();
+        assembly.setId( "test" );
+        assembly.setIncludeBaseDirectory( true );
+
+        FileItem readmeFileItem = new FileItem();
+        readmeFileItem.setSource( "README.txt" );
+        readmeFileItem.setOutputDirectory( "" );
+        readmeFileItem.setFiltered( false );
+        readmeFileItem.setLineEnding( "keep" );
+        readmeFileItem.setFileMode( "777" );
+
+        FileItem licenseFileItem = new FileItem();
+        licenseFileItem.setSource( "LICENSE.txt" );
+        licenseFileItem.setOutputDirectory( "/" );
+        licenseFileItem.setFiltered( false );
+        licenseFileItem.setLineEnding( "keep" );
+        licenseFileItem.setFileMode( "777" );
+
+        FileItem configFileItem = new FileItem();
+        configFileItem.setSource( "config/config.txt" );
+        configFileItem.setOutputDirectory( "config" );
+        configFileItem.setFiltered( false );
+        configFileItem.setLineEnding( "keep" );
+        configFileItem.setFileMode( "777" );
+
+        macArchiver.expectAddFile( readmeFile, "README.txt", Integer.parseInt( "777", 8 ) );
+        macArchiver.expectAddFile( licenseFile, "LICENSE.txt", Integer.parseInt( "777", 8 ) );
+        macArchiver.expectAddFile( configFile, "config/config.txt", Integer.parseInt( "777", 8 ) );
+
+        assembly.addFile( readmeFileItem );
+        assembly.addFile( licenseFileItem );
+        assembly.addFile( configFileItem );
+
+        mm.replayAll();
+
+        createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
+
+        mm.verifyAll();
+    }
+
+    public void testExecute_WithOutputDirectoryAndDestName()
+        throws Exception
+    {
+        MockManager mm = new MockManager();
+
+        MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
+
+        File basedir = fileManager.createTempDir();
+
+        File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
+        File licenseFile = fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
+        File configFile = fileManager.createFile( basedir, "config/config.txt",
+                                                  "This is a test file for config/config.txt" );
+
+        macCS.expectGetBasedir( basedir );
+
+        File tempRoot = fileManager.createTempDir();
+
+        macCS.expectGetTemporaryRootDirectory( tempRoot );
+
+        macCS.expectGetProject( new MavenProject( new Model() ) );
+
+        macCS.expectGetFinalName( "final-name" );
+
+        MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
+
+        MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
+
+        Assembly assembly = new Assembly();
+        assembly.setId( "test" );
+        assembly.setIncludeBaseDirectory( true );
+
+        FileItem readmeFileItem = new FileItem();
+        readmeFileItem.setSource( "README.txt" );
+        readmeFileItem.setOutputDirectory( "" );
+        readmeFileItem.setDestName( "README_renamed.txt" );
+        readmeFileItem.setFiltered( false );
+        readmeFileItem.setLineEnding( "keep" );
+        readmeFileItem.setFileMode( "777" );
+
+        FileItem licenseFileItem = new FileItem();
+        licenseFileItem.setSource( "LICENSE.txt" );
+        licenseFileItem.setOutputDirectory( "/" );
+        licenseFileItem.setDestName( "LICENSE_renamed.txt" );
+        licenseFileItem.setFiltered( false );
+        licenseFileItem.setLineEnding( "keep" );
+        licenseFileItem.setFileMode( "777" );
+
+        FileItem configFileItem = new FileItem();
+        configFileItem.setSource( "config/config.txt" );
+        configFileItem.setDestName( "config_renamed.txt" );
+        configFileItem.setOutputDirectory( "config" );
+        configFileItem.setFiltered( false );
+        configFileItem.setLineEnding( "keep" );
+        configFileItem.setFileMode( "777" );
+
+        macArchiver.expectAddFile( readmeFile, "README_renamed.txt", Integer.parseInt( "777", 8 ) );
+        macArchiver.expectAddFile( licenseFile, "LICENSE_renamed.txt", Integer.parseInt( "777", 8 ) );
+        macArchiver.expectAddFile( configFile, "config/config_renamed.txt", Integer.parseInt( "777", 8 ) );
+
+        assembly.addFile( readmeFileItem );
+        assembly.addFile( licenseFileItem );
+        assembly.addFile( configFileItem );
+
+        mm.replayAll();
+
+        createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
+
+        mm.verifyAll();
+    }
+
+    public void testExecute_WithOutputDirectoryAndDestNameAndIncludeBaseDirectoryFalse()
+        throws Exception
+    {
+        MockManager mm = new MockManager();
+
+        MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
+
+        File basedir = fileManager.createTempDir();
+
+        File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
+        File licenseFile = fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
+        File configFile = fileManager.createFile( basedir, "config/config.txt",
+                                                  "This is a test file for config/config.txt" );
+
+        macCS.expectGetBasedir( basedir );
+
+        File tempRoot = fileManager.createTempDir();
+
+        macCS.expectGetTemporaryRootDirectory( tempRoot );
+
+        macCS.expectGetProject( new MavenProject( new Model() ) );
+
+        macCS.expectGetFinalName( "final-name" );
+
+        MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
+
+        MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
+
+        Assembly assembly = new Assembly();
+        assembly.setId( "test" );
+        assembly.setIncludeBaseDirectory( false );
+
+        FileItem readmeFileItem = new FileItem();
+        readmeFileItem.setSource( "README.txt" );
+        readmeFileItem.setDestName( "README_renamed.txt" );
+        readmeFileItem.setFiltered( false );
+        readmeFileItem.setLineEnding( "keep" );
+        readmeFileItem.setFileMode( "777" );
+
+        FileItem licenseFileItem = new FileItem();
+        licenseFileItem.setSource( "LICENSE.txt" );
+        licenseFileItem.setDestName( "LICENSE_renamed.txt" );
+        licenseFileItem.setFiltered( false );
+        licenseFileItem.setLineEnding( "keep" );
+        licenseFileItem.setFileMode( "777" );
+
+        FileItem configFileItem = new FileItem();
+        configFileItem.setSource( "config/config.txt" );
+        configFileItem.setDestName( "config_renamed.txt" );
+        configFileItem.setOutputDirectory( "config" );
+        configFileItem.setFiltered( false );
+        configFileItem.setLineEnding( "keep" );
+        configFileItem.setFileMode( "777" );
+
+        macArchiver.expectAddFile( readmeFile, "README_renamed.txt", Integer.parseInt( "777", 8 ) );
+        macArchiver.expectAddFile( licenseFile, "LICENSE_renamed.txt", Integer.parseInt( "777", 8 ) );
+        macArchiver.expectAddFile( configFile, "config/config_renamed.txt", Integer.parseInt( "777", 8 ) );
+
+        assembly.addFile( readmeFileItem );
+        assembly.addFile( licenseFileItem );
+        assembly.addFile( configFileItem );
+
+        mm.replayAll();
+
+        createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
+
+        mm.verifyAll();
+    }
+
     private FileItemAssemblyPhase createPhase( Logger logger )
     {
         FileItemAssemblyPhase phase = new FileItemAssemblyPhase();