Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Fixed IT 

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@752071 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-03-10 11:34:51 +00:00
parent 021d405b8b
commit aeba75bc04
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
View File

@ -64,14 +64,15 @@ public class MavenITmng3732ActiveProfilesTest
Properties props = verifier.loadProperties( "target/profile.properties" ); Properties props = verifier.loadProperties( "target/profile.properties" );
List ids = new ArrayList(); List ids = new ArrayList();
ids.add( props.getProperty( "project.activeProfiles.0.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.1.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.2.id", "" ) );
Collections.sort( ids );
// support for profiles.xml removed from 3.x (see MNG-4060) // support for profiles.xml removed from 3.x (see MNG-4060)
if ( matchesVersionRange( "[2.0,3.0-alpha-1)" ) ) if ( matchesVersionRange( "[2.0,3.0-alpha-1)" ) )
{ {
ids.add( props.getProperty( "project.activeProfiles.0.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.1.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.2.id", "" ) );
Collections.sort( ids );
assertEquals( Arrays.asList( new String[] { "pom", "profiles", "settings" } ), ids ); assertEquals( Arrays.asList( new String[] { "pom", "profiles", "settings" } ), ids );
assertEquals( "3", props.getProperty( "project.activeProfiles" ) ); assertEquals( "3", props.getProperty( "project.activeProfiles" ) );
@ -81,6 +82,10 @@ public class MavenITmng3732ActiveProfilesTest
} }
else else
{ {
ids.add( props.getProperty( "project.activeProfiles.0.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.1.id", "" ) );
Collections.sort( ids );
assertEquals( Arrays.asList( new String[] { "pom", "settings" } ), ids ); assertEquals( Arrays.asList( new String[] { "pom", "settings" } ), ids );
assertEquals( "2", props.getProperty( "project.activeProfiles" ) ); assertEquals( "2", props.getProperty( "project.activeProfiles" ) );