Author: jdcasey
Date: Fri Aug 1 12:36:45 2008
New Revision: 681797
URL: http://svn.apache.org/viewvc?rev=681797&view=rev
Log:
[MNG-3693] Adding integration test.
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/src/main/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/src/main/java/plugin/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/src/main/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/src/main/java/tests/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/src/main/java/tests/app/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/src/main/java/tests/app/App.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/src/main/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/src/main/java/tests/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/src/main/java/tests/dep/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/src/main/java/tests/dep/Dep.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/src/test/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/pom.xml
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=681797&r1=681796&r2=681797&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Fri Aug 1 12:36:45 2008
@@ -76,7 +76,7 @@
MavenITmng3645POMSyntaxErrorTest
*/
- // Correct wagon issue in 2.0.10 first
+ suite.addTestSuite( MavenITmng3693PomFileBasedirChangeTest.class );
suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAV.class );
suite.addTestSuite( MavenITmng3684BuildPluginParameterTest.class );
suite.addTestSuite( MavenITmng3680InvalidDependencyPOMTest.class );
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java?rev=681797&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
Fri Aug 1 12:36:45 2008
@@ -0,0 +1,52 @@
+package org.apache.maven.integrationtests;
+
+import java.io.File;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.FileUtils;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test that changes to a project's POM file reference
(MavenProject.setFile(..))
+ * doesn't affect the basedir of the project instance for using that project's
classes directory
+ * in the classpath of another project's build...this happens when both
projects are
+ * built in the same reactor, and one project depends on the other.
+ *
+ * @author jdcasey
+ */
+public class MavenITmng3693PomFileBasedirChangeTest
+ extends AbstractMavenIntegrationTestCase
+{
+ public void testitMNG3693 ()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3693-pomFileBasedirChange" );
+
+ File pluginDir = new File( testDir, "maven-mng3693-plugin" );
+ File projectsDir = new File( testDir, "projects" );
+
+ Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+
+ verifier.executeGoal( "install" );
+
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ String depPath = verifier.getArtifactPath(
"org.apache.maven.its.mng3693", "dep", "1", "pom" );
+
+ File dep = new File( depPath );
+ dep = dep.getParentFile().getParentFile();
+
+ // remove the dependency from the local repository.
+ FileUtils.deleteDirectory( dep );
+
+ verifier = new Verifier( projectsDir.getAbsolutePath() );
+
+ verifier.executeGoal( "package" );
+
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ }
+}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/pom.xml?rev=681797&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/pom.xml
Fri Aug 1 12:36:45 2008
@@ -0,0 +1,28 @@
+<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>org.apache.maven.its.mng3693</groupId>
+ <artifactId>maven-mng3693-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1</version>
+ <name>maven-mng3693-plugin Maven Mojo</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ </dependencies>
+</project>
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java?rev=681797&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
Fri Aug 1 12:36:45 2008
@@ -0,0 +1,59 @@
+package plugin;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.FileUtils;
+
+/**
+ * @goal move-pom
+ * @phase package
+ */
+public class MyMojo
+ extends AbstractMojo
+{
+ /**
+ * @parameter expression="${project}"
+ * @required
+ */
+ private MavenProject project;
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ File pomFile = project.getFile();
+
+ File movedPomFile = new File( project.getBuild().getDirectory(),
"pom.xml" );
+ movedPomFile.getParentFile().mkdirs();
+
+ try
+ {
+ FileUtils.copyFile( pomFile, movedPomFile );
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "Failed to copy pom file: " +
pomFile + " to: " + movedPomFile, e );
+ }
+
+ project.setFile( movedPomFile );
+ }
+}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/pom.xml?rev=681797&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/pom.xml
Fri Aug 1 12:36:45 2008
@@ -0,0 +1,26 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>org.apache.maven.its.mng3693</groupId>
+ <version>1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng3693</groupId>
+ <artifactId>app</artifactId>
+ <name>app</name>
+ <version>1</version>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng3693</groupId>
+ <artifactId>dep</artifactId>
+ <version>1</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/src/main/java/tests/app/App.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/src/main/java/tests/app/App.java?rev=681797&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/src/main/java/tests/app/App.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/app/src/main/java/tests/app/App.java
Fri Aug 1 12:36:45 2008
@@ -0,0 +1,16 @@
+package tests.app;
+
+import tests.dep.Dep;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ new Dep();
+ System.out.println( "Hello World!" );
+ }
+}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/pom.xml?rev=681797&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/pom.xml
Fri Aug 1 12:36:45 2008
@@ -0,0 +1,31 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>org.apache.maven.its.mng3693</groupId>
+ <version>1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng3693</groupId>
+ <artifactId>dep</artifactId>
+ <version>1</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.mng3693</groupId>
+ <artifactId>maven-mng3693-plugin</artifactId>
+ <version>1</version>
+
+ <executions>
+ <execution>
+ <id>move-pom</id>
+ <phase>package</phase>
+ <goals>
+ <goal>move-pom</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/src/main/java/tests/dep/Dep.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/src/main/java/tests/dep/Dep.java?rev=681797&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/src/main/java/tests/dep/Dep.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/dep/src/main/java/tests/dep/Dep.java
Fri Aug 1 12:36:45 2008
@@ -0,0 +1,13 @@
+package tests.dep;
+
+/**
+ * Hello world!
+ *
+ */
+public class Dep
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/pom.xml?rev=681797&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3693-pomFileBasedirChange/projects/pom.xml
Fri Aug 1 12:36:45 2008
@@ -0,0 +1,12 @@
+<?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>org.apache.maven.its.mng3693</groupId>
+ <artifactId>parent</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>dep</module>
+ <module>app</module>
+ </modules>
+</project>
\ No newline at end of file
