You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2015/01/02 19:57:57 UTC
svn commit: r1649091 - in /maven/plugins/trunk/maven-install-plugin/src/test:
java/org/apache/maven/plugin/install/InstallFileMojoTest.java
resources/unit/install-file-layout-test/plugin-config.xml
Author: rfscholte
Date: Fri Jan 2 18:57:57 2015
New Revision: 1649091
URL: http://svn.apache.org/r1649091
Log:
Let unit-tests clean up their extracted pomFile
Modified:
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java
maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-layout-test/plugin-config.xml
Modified: maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java?rev=1649091&r1=1649090&r2=1649091&view=diff
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java (original)
+++ maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java Fri Jan 2 18:57:57 2015
@@ -81,6 +81,9 @@ public class InstallFileMojoTest
assignValuesForParameter( mojo );
mojo.execute();
+
+ File pomFile = (File) getVariableValueFromObject( mojo, "pomFile" );
+ org.codehaus.plexus.util.FileUtils.forceDelete( pomFile );
File installedArtifact = new File( getBasedir(), LOCAL_REPO + groupId + "/" + artifactId + "/" + version + "/" +
artifactId + "-" + version + "." + packaging );
@@ -102,6 +105,9 @@ public class InstallFileMojoTest
mojo.setLocalRepositoryPath( new File( getBasedir(), LOCAL_REPO ) );
mojo.execute();
+
+ File pomFile = (File) getVariableValueFromObject( mojo, "pomFile" );
+ org.codehaus.plexus.util.FileUtils.forceDelete( pomFile );
File installedArtifact = new File( getBasedir(),
LOCAL_REPO + legacyGroupId + "/" + "jars" + "/" + artifactId + "-" + version
@@ -126,6 +132,9 @@ public class InstallFileMojoTest
mojo.execute();
+ File pomFile = (File) getVariableValueFromObject( mojo, "pomFile" );
+ org.codehaus.plexus.util.FileUtils.forceDelete( pomFile );
+
File installedArtifact = new File( getBasedir(), LOCAL_REPO + groupId + "/" + artifactId + "/" + version + "/" +
artifactId + "-" + version + "-" + classifier + "." + packaging );
Modified: maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-layout-test/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-layout-test/plugin-config.xml?rev=1649091&r1=1649090&r2=1649091&view=diff
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-layout-test/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-layout-test/plugin-config.xml Fri Jan 2 18:57:57 2015
@@ -27,7 +27,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<repositoryLayout>legacy</repositoryLayout>
- <file>${basedir}/src/test/resources/unit/install-file-basic-test/target/maven-install-test-1.0-SNAPSHOT.jar
+ <file>${basedir}/src/test/resources/unit/install-file-layout-test/target/maven-install-test-1.0-SNAPSHOT.jar
</file>
<localRepository>${localRepository}</localRepository>
</configuration>