diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 13aedf4872..e8b6edb532 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -212,6 +212,8 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng0866EvaluateDefaultValueTest.class ); suite.addTestSuite( MavenITmng0848SystemPropOverridesDefaultValueTest.class ); suite.addTestSuite( MavenITmng0836PluginParentResolutionTest.class ); + suite.addTestSuite( MavenITmng0674PluginParameterAliasTest.class ); + suite.addTestSuite( MavenITmng0557UserSettingsCliOptionTest.class ); suite.addTestSuite( MavenITmng0522PluginMgmtConfigTest.class ); suite.addTestSuite( MavenITmng0507ArtifactRelocationTest.class ); suite.addTestSuite( MavenITmng0505VersionRangeTest.class ); @@ -220,6 +222,9 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng0469ReportConfigTest.class ); suite.addTestSuite( MavenITmng0377PluginLookupFromPrefixTest.class ); suite.addTestSuite( MavenITmng0294MergeGlobalAndUserSettingsTest.class ); + suite.addTestSuite( MavenITmng0282NonReactorExecWhenProjectIndependentTest.class ); + suite.addTestSuite( MavenITmng0249ResolveDepsFromReactorTest.class ); + suite.addTestSuite( MavenITmng0095ReactorFailureBehaviorTest.class ); suite.addTestSuite( MavenIT0142DirectDependencyScopesTest.class ); suite.addTestSuite( MavenIT0140Test.class ); suite.addTestSuite( MavenIT0139Test.class ); @@ -270,13 +275,8 @@ public class IntegrationTestSuite suite.addTestSuite( MavenIT0053Test.class ); suite.addTestSuite( MavenIT0052Test.class ); suite.addTestSuite( MavenIT0051Test.class ); - suite.addTestSuite( MavenIT0049Test.class ); suite.addTestSuite( MavenIT0047Test.class ); - suite.addTestSuite( MavenIT0046Test.class ); - suite.addTestSuite( MavenIT0045Test.class ); - suite.addTestSuite( MavenIT0044Test.class ); suite.addTestSuite( MavenIT0043Test.class ); - suite.addTestSuite( MavenIT0042Test.class ); suite.addTestSuite( MavenIT0041Test.class ); suite.addTestSuite( MavenIT0040Test.class ); suite.addTestSuite( MavenIT0039Test.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040Test.java index 34ed528574..3d302fe837 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040Test.java @@ -24,6 +24,12 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; +/** + * This is a test set for MNG-598. + * + * @author Brett Porter + * @version $Id$ + */ public class MavenIT0040Test extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java index e698d5bf8b..09ca368083 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java @@ -24,6 +24,12 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; +/** + * This is a test set for MNG-598. + * + * @author Brett Porter + * @version $Id$ + */ public class MavenIT0041Test extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0046Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java similarity index 88% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0046Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java index 8f81f866bb..76da274d23 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0046Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java @@ -26,7 +26,13 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -public class MavenIT0046Test +/** + * This is a test set for MNG-95. + * + * @author John Casey + * @version $Id$ + */ +public class MavenITmng0095ReactorFailureBehaviorTest extends AbstractMavenIntegrationTestCase { @@ -34,10 +40,10 @@ public class MavenIT0046Test * Test fail-never reactor behavior. Forces an exception to be thrown in * the first module, but checks that the second modules is built. */ - public void testit0046() + public void testitMNG95() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0046" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0095" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" ); List cliOptions = new ArrayList(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0042Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java similarity index 88% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0042Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java index b749daad4a..fa452bd955 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0042Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java @@ -24,17 +24,23 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -public class MavenIT0042Test +/** + * This is a test set for MNG-249. + * + * @author Brett Porter + * @version $Id$ + */ +public class MavenITmng0249ResolveDepsFromReactorTest extends AbstractMavenIntegrationTestCase { /** * Test that the reactor can establish the artifact location of known projects for dependencies */ - public void testit0042() + public void testitMNG249() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0042" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0249" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "package" ); verifier.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0045Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java similarity index 87% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0045Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java index 85233db526..f6644ef8d8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0045Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java @@ -26,17 +26,23 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -public class MavenIT0045Test +/** + * This is a test set for MNG-282. + * + * @author John Casey + * @version $Id$ + */ +public class MavenITmng0282NonReactorExecWhenProjectIndependentTest extends AbstractMavenIntegrationTestCase { /** * Test non-reactor behavior when plugin declares "@requiresProject false" */ - public void testit0045() + public void testitMNG282() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0045" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0282" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-no-project", "1.0", "maven-plugin" ); List cliOptions = new ArrayList(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0044Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java similarity index 86% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0044Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java index 981c82ba22..99f94a6b8b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0044Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java @@ -26,17 +26,23 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -public class MavenIT0044Test +/** + * This is a test set for MNG-557. + * + * @author John Casey + * @version $Id$ + */ +public class MavenITmng0557UserSettingsCliOptionTest extends AbstractMavenIntegrationTestCase { /** * Test --settings CLI option */ - public void testit0044() + public void testitMNG557() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0044" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0557" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); List cliOptions = new ArrayList(); cliOptions.add( "--settings settings.xml" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0049Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java similarity index 84% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0049Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java index 9e4a1ccd77..f955036237 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0049Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java @@ -24,20 +24,24 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -public class MavenIT0049Test +/** + * This is a test set for MNG-674. + * + * @author John Casey + * @version $Id$ + */ +public class MavenITmng0674PluginParameterAliasTest extends AbstractMavenIntegrationTestCase { /** * Test parameter alias usage. */ - public void testit0049() + public void testitMNG674() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0049" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0674" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - //todo: i don't think we need to delete this plugin - //verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-touch", "1.0", "maven-plugin" ); verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" ); verifier.assertFilePresent( "target/touchFile.txt" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/resources/it0046/pom.xml b/its/core-it-suite/src/test/resources/mng-0095/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0046/pom.xml rename to its/core-it-suite/src/test/resources/mng-0095/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0046/subproject/pom.xml b/its/core-it-suite/src/test/resources/mng-0095/subproject/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0046/subproject/pom.xml rename to its/core-it-suite/src/test/resources/mng-0095/subproject/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0046/subproject2/pom.xml b/its/core-it-suite/src/test/resources/mng-0095/subproject2/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0046/subproject2/pom.xml rename to its/core-it-suite/src/test/resources/mng-0095/subproject2/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0042/pom.xml b/its/core-it-suite/src/test/resources/mng-0249/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0042/pom.xml rename to its/core-it-suite/src/test/resources/mng-0249/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0042/test-component-a/pom.xml b/its/core-it-suite/src/test/resources/mng-0249/test-component-a/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0042/test-component-a/pom.xml rename to its/core-it-suite/src/test/resources/mng-0249/test-component-a/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0042/test-component-a/src/main/java/A.java b/its/core-it-suite/src/test/resources/mng-0249/test-component-a/src/main/java/A.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0042/test-component-a/src/main/java/A.java rename to its/core-it-suite/src/test/resources/mng-0249/test-component-a/src/main/java/A.java diff --git a/its/core-it-suite/src/test/resources/it0042/test-component-b/pom.xml b/its/core-it-suite/src/test/resources/mng-0249/test-component-b/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0042/test-component-b/pom.xml rename to its/core-it-suite/src/test/resources/mng-0249/test-component-b/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0042/test-component-b/src/main/java/B.java b/its/core-it-suite/src/test/resources/mng-0249/test-component-b/src/main/java/B.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0042/test-component-b/src/main/java/B.java rename to its/core-it-suite/src/test/resources/mng-0249/test-component-b/src/main/java/B.java diff --git a/its/core-it-suite/src/test/resources/it0042/test-component-c/pom.xml b/its/core-it-suite/src/test/resources/mng-0249/test-component-c/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0042/test-component-c/pom.xml rename to its/core-it-suite/src/test/resources/mng-0249/test-component-c/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0042/test-component-c/src/main/java/C.java b/its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/java/C.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0042/test-component-c/src/main/java/C.java rename to its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/java/C.java diff --git a/its/core-it-suite/src/test/resources/it0042/test-component-c/src/main/webapp/WEB-INF/web.xml b/its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0042/test-component-c/src/main/webapp/WEB-INF/web.xml rename to its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/webapp/WEB-INF/web.xml diff --git a/its/core-it-suite/src/test/resources/it0042/test-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-0249/test-plugin/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0042/test-plugin/pom.xml rename to its/core-it-suite/src/test/resources/mng-0249/test-plugin/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0042/test-plugin/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java b/its/core-it-suite/src/test/resources/mng-0249/test-plugin/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0042/test-plugin/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java rename to its/core-it-suite/src/test/resources/mng-0249/test-plugin/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java diff --git a/its/core-it-suite/src/test/resources/it0045/pom.xml b/its/core-it-suite/src/test/resources/mng-0282/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0045/pom.xml rename to its/core-it-suite/src/test/resources/mng-0282/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0045/subproject/pom.xml b/its/core-it-suite/src/test/resources/mng-0282/subproject/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0045/subproject/pom.xml rename to its/core-it-suite/src/test/resources/mng-0282/subproject/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0044/pom.xml b/its/core-it-suite/src/test/resources/mng-0557/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0044/pom.xml rename to its/core-it-suite/src/test/resources/mng-0557/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0044/settings.xml b/its/core-it-suite/src/test/resources/mng-0557/settings.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0044/settings.xml rename to its/core-it-suite/src/test/resources/mng-0557/settings.xml diff --git a/its/core-it-suite/src/test/resources/it0044/src/main/java/org/apache/maven/it0044/Person.java b/its/core-it-suite/src/test/resources/mng-0557/src/main/java/org/apache/maven/it0044/Person.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0044/src/main/java/org/apache/maven/it0044/Person.java rename to its/core-it-suite/src/test/resources/mng-0557/src/main/java/org/apache/maven/it0044/Person.java diff --git a/its/core-it-suite/src/test/resources/it0049/pom.xml b/its/core-it-suite/src/test/resources/mng-0674/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0049/pom.xml rename to its/core-it-suite/src/test/resources/mng-0674/pom.xml