diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023Test.java index a03ddfd800..d1d3688848 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023Test.java @@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -import java.util.List; -import java.util.ArrayList; public class MavenIT0023Test extends AbstractMavenIntegrationTestCase @@ -37,15 +35,17 @@ public class MavenIT0023Test throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0023" ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - List cliOptions = new ArrayList(); - cliOptions.add( "--settings settings.xml" ); - verifier.setCliOptions( cliOptions ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.getCliOptions().add( "--settings" ); + verifier.getCliOptions().add( "settings.xml" ); verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" ); - verifier.assertFilePresent( "target/test.txt" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); + verifier.assertFilePresent( "target/test.txt" ); } -} +} diff --git a/its/core-it-suite/src/test/resources/it0023/pom.xml b/its/core-it-suite/src/test/resources/it0023/pom.xml index 67a4d8d8de..db7988b09e 100644 --- a/its/core-it-suite/src/test/resources/it0023/pom.xml +++ b/its/core-it-suite/src/test/resources/it0023/pom.xml @@ -1,10 +1,34 @@ + + + + 4.0.0 - Maven Integration Test :: it0023 + org.apache.maven.its.it0023 maven-it-it0023 - Test profile inclusion from settings.xml (this one is activated by an id in the activeProfiles section). 1.0-SNAPSHOT + + Maven Integration Test :: it0023 + Test profile inclusion from settings.xml (this one is activated by an id in the activeProfiles section). + diff --git a/its/core-it-suite/src/test/resources/it0023/settings.xml b/its/core-it-suite/src/test/resources/it0023/settings.xml index 7ba36a4d49..363bde0538 100644 --- a/its/core-it-suite/src/test/resources/it0023/settings.xml +++ b/its/core-it-suite/src/test/resources/it0023/settings.xml @@ -1,3 +1,24 @@ + + + + test-profile @@ -6,16 +27,9 @@ test-profile - - - - includeProfile - - - test.txt - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/it0023/src/main/java/org/apache/maven/it0023/Person.java b/its/core-it-suite/src/test/resources/it0023/src/main/java/org/apache/maven/it0023/Person.java deleted file mode 100644 index b57f4308e2..0000000000 --- a/its/core-it-suite/src/test/resources/it0023/src/main/java/org/apache/maven/it0023/Person.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.apache.maven.it0023; - -public class Person -{ - private String name; - - public void setName( String name ) - { - this.name = name; - } - - public String getName() - { - return name; - } -}