Author: jdcasey
Date: Fri Jan 18 12:14:44 2008
New Revision: 613254
URL: http://svn.apache.org/viewvc?rev=613254&view=rev
Log:
Adding new unit test for non-recursive run, where one of the modules that
should NOT be read contains an invalid parent reference.
Added:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java
(with props)
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/badmodule/
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/badmodule/pom.xml
(with props)
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/goodmodule/
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/goodmodule/pom.xml
(with props)
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/pom.xml
(with props)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?rev=613254&r1=613253&r2=613254&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
Fri Jan 18 12:14:44 2008
@@ -181,7 +181,7 @@
"POM: " + modelPom
+ " is not in the current reactor.
Its modules will not be scanned." );
}
- else
+ else if ( request.isRecursive() )
{
checkModulesForExtensions( modelPom,
model,
Added:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java?rev=613254&view=auto
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java
(added)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java
Fri Jan 18 12:14:44 2008
@@ -0,0 +1,52 @@
+package org.apache.maven.embedder.project;
+
+import org.apache.maven.embedder.Configuration;
+import org.apache.maven.embedder.DefaultConfiguration;
+import org.apache.maven.embedder.MavenEmbedder;
+import org.apache.maven.embedder.MavenEmbedderConsoleLogger;
+import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.logging.Logger;
+
+import java.io.File;
+import java.util.Iterator;
+
+import junit.framework.TestCase;
+
+public class BadModuleNotRecursiveTest
+ extends TestCase
+{
+ public void test()
+ throws Exception
+ {
+ Configuration configuration = new DefaultConfiguration();
+ configuration.setMavenEmbedderLogger( new MavenEmbedderConsoleLogger()
);
+ MavenEmbedder embedder = new MavenEmbedder( configuration );
+
+ File pom = new File(
"src/test/projects/bad-module-non-recursive/pom.xml" ).getCanonicalFile();
+
+ System.out.println( pom.getCanonicalFile() );
+
+ DefaultMavenExecutionRequest request = new
DefaultMavenExecutionRequest();
+ request.setOffline( false );
+ request.setUseReactor( false );
+ request.setRecursive( false );
+ request.setLoggingLevel( Logger.LEVEL_DEBUG );
+ request.setPom( pom );
+ request.setBaseDirectory( pom.getParentFile() );
+ MavenExecutionResult result = embedder.readProjectWithDependencies(
request );
+ MavenProject project = result.getProject();
+
+ if ( result.hasExceptions() )
+ {
+ for ( Iterator it = result.getExceptions().iterator();
it.hasNext(); )
+ {
+ Exception ex = (Exception) it.next();
+ ex.printStackTrace();
+ }
+ }
+
+ assertNotNull( project );
+ }
+}
Propchange:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/badmodule/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/badmodule/pom.xml?rev=613254&view=auto
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/badmodule/pom.xml
(added)
+++
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/badmodule/pom.xml
Fri Jan 18 12:14:44 2008
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>other</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>badmodule</groupId>
+ <artifactId>badmodule</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+</project>
\ No newline at end of file
Propchange:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/badmodule/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/badmodule/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/badmodule/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/goodmodule/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/goodmodule/pom.xml?rev=613254&view=auto
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/goodmodule/pom.xml
(added)
+++
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/goodmodule/pom.xml
Fri Jan 18 12:14:44 2008
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>badmodule</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>badmodule</groupId>
+ <artifactId>good</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+</project>
\ No newline at end of file
Propchange:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/goodmodule/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/goodmodule/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/goodmodule/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/pom.xml?rev=613254&view=auto
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/pom.xml
(added)
+++
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/pom.xml
Fri Jan 18 12:14:44 2008
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>badmodule</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>goodmodule</module>
+ <module>badmodule</module>
+ </modules>
+
+</project>
\ No newline at end of file
Propchange:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
maven/components/trunk/maven-embedder/src/test/projects/bad-module-non-recursive/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
