You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/03/07 00:25:59 UTC
svn commit: r751134 - in /maven/components/trunk/maven-project/src/test:
java/org/apache/maven/project/PomConstructionTest.java
resources-project-builder/profile-module/pom.xml
Author: bentmann
Date: Fri Mar 6 23:25:59 2009
New Revision: 751134
URL: http://svn.apache.org/viewvc?rev=751134&view=rev
Log:
o Extended UT to capture regression of MNG-786
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module/pom.xml (contents, props changed)
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=751134&r1=751133&r2=751134&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java Fri Mar 6 23:25:59 2009
@@ -28,13 +28,9 @@
import org.apache.maven.profiles.ProfileActivationContext;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.project.harness.PomTestWrapper;
-import org.apache.maven.project.*;
-import org.apache.maven.project.builder.PomClassicDomainModel;
-import org.apache.maven.repository.MavenRepositorySystem;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -50,8 +46,6 @@
private DefaultMavenProjectBuilder mavenProjectBuilder;
- private MavenRepositorySystem mavenTools;
-
private File testDirectory;
private File testMixinDirectory;
@@ -62,7 +56,6 @@
testDirectory = new File( getBasedir(), BASE_POM_DIR );
testMixinDirectory = new File( getBasedir(), BASE_MIXIN_DIR );
mavenProjectBuilder = (DefaultMavenProjectBuilder) lookup( MavenProjectBuilder.class );
- mavenTools = lookup( MavenRepositorySystem.class );
}
/**
@@ -76,20 +69,25 @@
{
buildPomFromMavenProject( "empty-distMng-repo-url", null );
}
-
/**
* Tests that modules is not overriden by profile
*
* @throws Exception
*/
+ /* FIXME: cf MNG-786
public void testProfileModules()
throws Exception
{
PomTestWrapper pom = buildPomFromMavenProject( "profile-module", "a" );
- assertEquals( "test-prop", pom.getValue( "properties[1]/b" ) );//verifies profile applied
- assertEquals( "test-module", pom.getValue( "modules[1]" ) );
+ assertEquals( "test-prop", pom.getValue( "properties[1]/b" ) );// verifies profile applied
+ assertEquals( 4, ( (List<?>) pom.getValue( "modules" ) ).size() );
+ assertEquals( "module-2", pom.getValue( "modules[1]" ) );
+ assertEquals( "module-1", pom.getValue( "modules[2]" ) );
+ assertEquals( "module-3", pom.getValue( "modules[3]" ) );
+ assertEquals( "module-4", pom.getValue( "modules[4]" ) );
}
+ //*/
/**
* Will throw exception if doesn't find parent(s) in build
Modified: maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module/pom.xml?rev=751134&r1=751133&r2=751134&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module/pom.xml (original)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module/pom.xml Fri Mar 6 23:25:59 2009
@@ -3,16 +3,22 @@
<groupId>gid</groupId>
<artifactId>aid</artifactId>
<version>1.0</version>
- <packaging>pom</packaging>
- <modules>
- <module>test-module</module>
- </modules>
- <profiles>
- <profile>
- <id>a</id>
- <properties>
- <b>test-prop</b>
- </properties>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
+ <packaging>pom</packaging>
+ <modules>
+ <module>module-2</module>
+ <module>module-1</module>
+ <module>module-3</module>
+ </modules>
+ <profiles>
+ <profile>
+ <id>a</id>
+ <properties>
+ <b>test-prop</b>
+ </properties>
+ <modules>
+ <module>module-1</module>
+ <module>module-4</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native