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 005790b9ca..8429defd01 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 @@ -225,11 +225,18 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng1415QuotedSystemPropertiesTest.class ); suite.addTestSuite( MavenITmng1412DependenciesOrderTest.class ); suite.addTestSuite( MavenITmng1323AntrunDependenciesTest.class ); + suite.addTestSuite( MavenITmng1052PluginMngtConfigTest.class ); + suite.addTestSuite( MavenITmng1021EqualAttachmentBuildNumberTest.class ); + suite.addTestSuite( MavenITmng0985NonExecutedPluginMngtGoalsTest.class ); + suite.addTestSuite( MavenITmng0932TestJarDeploymentTest.class ); suite.addTestSuite( MavenITmng0866EvaluateDefaultValueTest.class ); suite.addTestSuite( MavenITmng0851CustomPomFilenameTest.class ); suite.addTestSuite( MavenITmng0848SystemPropOverridesDefaultValueTest.class ); suite.addTestSuite( MavenITmng0836PluginParentResolutionTest.class ); + suite.addTestSuite( MavenITmng0823MojoContextPassingTest.class ); suite.addTestSuite( MavenITmng0814ExplicitProfileActivationTest.class ); + suite.addTestSuite( MavenITmng0786ProfileAwareReactorTest.class ); + suite.addTestSuite( MavenITmng0781PluginConfigVsExecConfigTest.class ); suite.addTestSuite( MavenITmng0773SettingsProfileReactorPollutionTest.class ); suite.addTestSuite( MavenITmng0768OfflineModeTest.class ); suite.addTestSuite( MavenITmng0761MissingSnapshotDistRepoTest.class ); @@ -278,13 +285,6 @@ public class IntegrationTestSuite suite.addTestSuite( MavenIT0082Test.class ); suite.addTestSuite( MavenIT0081Test.class ); suite.addTestSuite( MavenIT0080Test.class ); - suite.addTestSuite( MavenIT0079Test.class ); - suite.addTestSuite( MavenIT0078Test.class ); - suite.addTestSuite( MavenIT0077Test.class ); - suite.addTestSuite( MavenIT0076Test.class ); - suite.addTestSuite( MavenIT0075Test.class ); - suite.addTestSuite( MavenIT0074Test.class ); - suite.addTestSuite( MavenIT0073Test.class ); suite.addTestSuite( MavenIT0072Test.class ); suite.addTestSuite( MavenIT0071Test.class ); suite.addTestSuite( MavenIT0064Test.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071Test.java index 27c7d2e27d..e4dd1b6aaa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071Test.java @@ -24,6 +24,12 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; +/** + * This is a test set for MNG-885. + * + * @author John Casey + * @version $Id$ + */ public class MavenIT0071Test extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072Test.java index b5f5e60f39..b028747786 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072Test.java @@ -24,6 +24,12 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; +/** + * This is a test set for MNG-885. + * + * @author John Casey + * @version $Id$ + */ public class MavenIT0072Test extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0074Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java similarity index 85% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0074Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java index 8bb21f0570..c03137e649 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0074Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java @@ -24,7 +24,13 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -public class MavenIT0074Test +/** + * This is a test set for MNG-781. + * + * @author John Casey + * @version $Id$ + */ +public class MavenITmng0781PluginConfigVsExecConfigTest extends AbstractMavenIntegrationTestCase { @@ -32,10 +38,10 @@ public class MavenIT0074Test * Test that plugin-level configuration instances are not nullified by * execution-level configuration instances. */ - public void testit0074() + public void testitMNG0781() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0074" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0781" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "process-resources" ); verifier.assertFilePresent( "target/exec-level.txt" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java similarity index 89% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java index 454f7d19f6..13c36b2b28 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java @@ -25,7 +25,13 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; import java.util.Properties; -public class MavenIT0075Test +/** + * This is a test set for MNG-786. + * + * @author John Casey + * @version $Id$ + */ +public class MavenITmng0786ProfileAwareReactorTest extends AbstractMavenIntegrationTestCase { @@ -33,10 +39,10 @@ public class MavenIT0075Test * Verify that direct invocation of a mojo from the command line still * results in the processing of modules included via profiles. */ - public void testit0075() + public void testitMNG0786() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0075" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0786" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0073Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java similarity index 88% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0073Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java index 64e14a076d..e13a638849 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0073Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java @@ -26,17 +26,23 @@ import java.io.File; import java.util.Arrays; import java.util.List; -public class MavenIT0073Test +/** + * This is a test set for MNG-823. + * + * @author John Casey + * @version $Id$ + */ +public class MavenITmng0823MojoContextPassingTest extends AbstractMavenIntegrationTestCase { /** * Tests context passing between mojos in the same plugin. */ - public void testit0073() + public void testitMNG0823() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0073" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0823" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-context-passing", "1.0", "maven-plugin" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0077Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0932TestJarDeploymentTest.java similarity index 86% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0077Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0932TestJarDeploymentTest.java index 4fcce310ed..3550e3d030 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0077Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0932TestJarDeploymentTest.java @@ -27,16 +27,22 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -public class MavenIT0077Test +/** + * This is a test set for MNG-932. + * + * @author Brett Porter + * @version $Id$ + */ +public class MavenITmng0932TestJarDeploymentTest extends AbstractMavenIntegrationTestCase { /** * Test test jar attachment. */ - public void testit0077() + public void testitMNG0932() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0077" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0932" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.deleteArtifact( "org.apache.maven.its.it0077", "sub1", "1.0", "test-jar" ); verifier.executeGoal( "install" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0076Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java similarity index 85% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0076Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java index 04ed153a90..653e46568e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0076Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java @@ -24,7 +24,13 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -public class MavenIT0076Test +/** + * This is a test set for MNG-985. + * + * @author John Casey + * @version $Id$ + */ +public class MavenITmng0985NonExecutedPluginMngtGoalsTest extends AbstractMavenIntegrationTestCase { @@ -33,10 +39,10 @@ public class MavenIT0076Test * unless they are referenced by groupId/artifactId within the plugins * section of a pom. */ - public void testit0076() + public void testitMNG0985() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0076" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0985" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "initialize" ); verifier.assertFileNotPresent( "target/unexpected.txt" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0079Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java similarity index 86% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0079Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java index 06d1fac663..d01af72f5b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0079Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java @@ -24,7 +24,13 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -public class MavenIT0079Test +/** + * This is a test set for MNG-1021. + * + * @author John Casey + * @version $Id$ + */ +public class MavenITmng1021EqualAttachmentBuildNumberTest extends AbstractMavenIntegrationTestCase { @@ -32,10 +38,10 @@ public class MavenIT0079Test * Test that source attachments have the same build number as the main * artifact when deployed. */ - public void testit0079() + public void testitMNG1021() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0079" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1021" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "initialize" ); verifier.assertFilePresent( diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0078Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java similarity index 86% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0078Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java index 3938b0dfa6..15616ccb0b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0078Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java @@ -24,7 +24,13 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -public class MavenIT0078Test +/** + * This is a test set for MNG-1052. + * + * @author John Casey + * @version $Id$ + */ +public class MavenITmng1052PluginMngtConfigTest extends AbstractMavenIntegrationTestCase { @@ -33,10 +39,10 @@ public class MavenIT0078Test * PluginManagement section even when it's not explicitly defined in the * plugins section. */ - public void testit0078() + public void testitMNG1052() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0078" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1052" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "process-resources" ); verifier.assertFilePresent( "target/plugin-management.txt" ); diff --git a/its/core-it-suite/src/test/resources/it0074/pom.xml b/its/core-it-suite/src/test/resources/mng-0781/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0074/pom.xml rename to its/core-it-suite/src/test/resources/mng-0781/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0075/pom.xml b/its/core-it-suite/src/test/resources/mng-0786/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0075/pom.xml rename to its/core-it-suite/src/test/resources/mng-0786/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0075/sub1/pom.xml b/its/core-it-suite/src/test/resources/mng-0786/sub1/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0075/sub1/pom.xml rename to its/core-it-suite/src/test/resources/mng-0786/sub1/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0075/sub2/pom.xml b/its/core-it-suite/src/test/resources/mng-0786/sub2/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0075/sub2/pom.xml rename to its/core-it-suite/src/test/resources/mng-0786/sub2/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0073/pom.xml b/its/core-it-suite/src/test/resources/mng-0823/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0073/pom.xml rename to its/core-it-suite/src/test/resources/mng-0823/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0077/pom.xml b/its/core-it-suite/src/test/resources/mng-0932/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0077/pom.xml rename to its/core-it-suite/src/test/resources/mng-0932/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0077/sub1/pom.xml b/its/core-it-suite/src/test/resources/mng-0932/sub1/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0077/sub1/pom.xml rename to its/core-it-suite/src/test/resources/mng-0932/sub1/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0077/sub1/src/main/java/org/apache/maven/it0077/Person.java b/its/core-it-suite/src/test/resources/mng-0932/sub1/src/main/java/org/apache/maven/it0077/Person.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0077/sub1/src/main/java/org/apache/maven/it0077/Person.java rename to its/core-it-suite/src/test/resources/mng-0932/sub1/src/main/java/org/apache/maven/it0077/Person.java diff --git a/its/core-it-suite/src/test/resources/it0077/sub1/src/test/java/org/apache/maven/it0077/PersonTest.java b/its/core-it-suite/src/test/resources/mng-0932/sub1/src/test/java/org/apache/maven/it0077/PersonTest.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0077/sub1/src/test/java/org/apache/maven/it0077/PersonTest.java rename to its/core-it-suite/src/test/resources/mng-0932/sub1/src/test/java/org/apache/maven/it0077/PersonTest.java diff --git a/its/core-it-suite/src/test/resources/it0077/sub2/pom.xml b/its/core-it-suite/src/test/resources/mng-0932/sub2/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0077/sub2/pom.xml rename to its/core-it-suite/src/test/resources/mng-0932/sub2/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0077/sub2/src/test/java/org/apache/maven/it0077/PersonTwoTest.java b/its/core-it-suite/src/test/resources/mng-0932/sub2/src/test/java/org/apache/maven/it0077/PersonTwoTest.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0077/sub2/src/test/java/org/apache/maven/it0077/PersonTwoTest.java rename to its/core-it-suite/src/test/resources/mng-0932/sub2/src/test/java/org/apache/maven/it0077/PersonTwoTest.java diff --git a/its/core-it-suite/src/test/resources/it0076/pom.xml b/its/core-it-suite/src/test/resources/mng-0985/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0076/pom.xml rename to its/core-it-suite/src/test/resources/mng-0985/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0079/jars/attached.jar b/its/core-it-suite/src/test/resources/mng-1021/jars/attached.jar similarity index 100% rename from its/core-it-suite/src/test/resources/it0079/jars/attached.jar rename to its/core-it-suite/src/test/resources/mng-1021/jars/attached.jar diff --git a/its/core-it-suite/src/test/resources/it0079/jars/main.jar b/its/core-it-suite/src/test/resources/mng-1021/jars/main.jar similarity index 100% rename from its/core-it-suite/src/test/resources/it0079/jars/main.jar rename to its/core-it-suite/src/test/resources/mng-1021/jars/main.jar diff --git a/its/core-it-suite/src/test/resources/it0079/pom.xml b/its/core-it-suite/src/test/resources/mng-1021/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0079/pom.xml rename to its/core-it-suite/src/test/resources/mng-1021/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0078/pom.xml b/its/core-it-suite/src/test/resources/mng-1052/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0078/pom.xml rename to its/core-it-suite/src/test/resources/mng-1052/pom.xml