Author: jdcasey
Date: Tue Feb 5 13:29:50 2008
New Revision: 618782
URL: http://svn.apache.org/viewvc?rev=618782&view=rev
Log:
[MNG-1493] Adding integration test verifying that modules specifying
alternative pom-file names are allowed, in addition to the older-style module
specs where only the dir name was referenced, and a 'pom.xml' file was expected
within.
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/module/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/module/pom-unusual.xml
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/pom.xml
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/readme.txt
(with props)
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=618782&r1=618781&r2=618782&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Tue Feb 5 13:29:50 2008
@@ -189,6 +189,7 @@
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;
}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java?rev=618782&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java
Tue Feb 5 13:29:50 2008
@@ -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();
+ }
+}
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/module/pom-unusual.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/module/pom-unusual.xml?rev=618782&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/module/pom-unusual.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/module/pom-unusual.xml
Tue Feb 5 13:29:50 2008
@@ -0,0 +1,7 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.itsample</groupId>
+ <artifactId>module</artifactId>
+ <packaging>pom</packaging>
+ <version>1</version>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/module/pom-unusual.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/module/pom-unusual.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/pom.xml?rev=618782&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/pom.xml
Tue Feb 5 13:29:50 2008
@@ -0,0 +1,11 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng1493</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1</version>
+
+ <modules>
+ <module>module/pom-unusual.xml</module>
+ </modules>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/readme.txt
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/readme.txt?rev=618782&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/readme.txt
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/readme.txt
Tue Feb 5 13:29:50 2008
@@ -0,0 +1 @@
+Checks that non-standard module-pom filenames can be referenced by file within
a <modules/> 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
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/readme.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-1493-nonstandardModulePomNames/readme.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
