diff --git a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java index b78389ea98..5f30e68201 100644 --- a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java +++ b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java @@ -189,6 +189,7 @@ public static Test suite() throws VerificationException suite.addTestSuite( MavenITmng3372DirectInvocationOfPlugins.class ); suite.addTestSuite( MavenITmng3099SettingsProfilesWithNoPOM.class ); suite.addTestSuite( MavenITmng3331ModulePathNormalization.class ); + suite.addTestSuite( MavenITmng1493NonStandardModulePomNames.class ); // suite.addTestSuite( MavenIT0120EjbClientDependency.class ); -- not passing for 2.0.7 either, looks to be 2.1+ ? return suite; } diff --git a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java new file mode 100644 index 0000000000..46b5687c90 --- /dev/null +++ b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java @@ -0,0 +1,36 @@ +package org.apache.maven.integrationtests; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; + +public class MavenITmng1493NonStandardModulePomNames + extends AbstractMavenIntegrationTestCase +{ + public void testitMNG1493 () + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1493-nonstandardModulePomNames" ); + + Verifier verifier; + + verifier = new Verifier( testDir.getAbsolutePath() ); + + verifier.executeGoal( "initialize" ); + + /* + * This is the simplest way to check a build + * succeeded. It is also the simplest way to create + * an IT test: make the build pass when the test + * should pass, and make the build fail when the + * test should fail. There are other methods + * supported by the verifier. They can be seen here: + * http://maven.apache.org/shared/maven-verifier/apidocs/index.html + */ + verifier.verifyErrorFreeLog(); + } +} diff --git a/its/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/module/pom-unusual.xml b/its/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/module/pom-unusual.xml new file mode 100644 index 0000000000..372e7e316a --- /dev/null +++ b/its/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/module/pom-unusual.xml @@ -0,0 +1,7 @@ + + 4.0.0 + org.apache.maven.its.itsample + module + pom + 1 + diff --git a/its/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/pom.xml b/its/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/pom.xml new file mode 100644 index 0000000000..1b9ab208bb --- /dev/null +++ b/its/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/pom.xml @@ -0,0 +1,11 @@ + + 4.0.0 + org.apache.maven.its.mng1493 + parent + pom + 1 + + + module/pom-unusual.xml + + diff --git a/its/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/readme.txt b/its/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/readme.txt new file mode 100644 index 0000000000..c42c04f088 --- /dev/null +++ b/its/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/readme.txt @@ -0,0 +1 @@ +Checks that non-standard module-pom filenames can be referenced by file within a section, rather than depending on using the directory name with the normal 'pom.xml' as an implied POM filename. \ No newline at end of file