You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/01/15 00:59:22 UTC
svn commit: r611974 - in /maven/components/trunk:
maven-core/src/main/aspect/org/apache/maven/errors/
maven-core/src/main/java/org/apache/maven/errors/
maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/
maven-embedd...
Author: jdcasey
Date: Mon Jan 14 15:59:01 2008
New Revision: 611974
URL: http://svn.apache.org/viewvc?rev=611974&view=rev
Log:
two more unit tests, and a little simplification to take care of duplicated error reporting coverage.
Added:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/pom.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/maven/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/maven/test/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/maven/test/error/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/maven/test/error/mojoFailure/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/maven/test/error/mojoFailure/App.java (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/maven/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/maven/test/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/maven/test/error/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/maven/test/error/mojoFailure/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/pom.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/maven/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/maven/test/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/maven/test/error/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/maven/test/error/mojoFailure/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/maven/test/error/mojoFailure/App.java (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/maven/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/maven/test/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/maven/test/error/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/maven/test/error/mojoFailure/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java (with props)
Modified:
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
Modified: maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj?rev=611974&r1=611973&r2=611974&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj (original)
+++ maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj Mon Jan 14 15:59:01 2008
@@ -4,9 +4,8 @@
import org.codehaus.plexus.logging.Logger;
import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
import org.apache.maven.plugin.PluginConfigurationException;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.loader.PluginLoaderException;
@@ -217,29 +216,14 @@
after( MavenProject project, String scope ) throwing( ArtifactResolutionException cause ):
pm_resolveTransitiveDependencies( project, scope )
{
- getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );
- }
-
- private pointcut within_pm_downloadDependencies( MavenProject project ):
- withincode( void DefaultPluginManager.downloadDependencies( MavenProject, .. ) )
- && args( project, .. );
-
- private pointcut ar_resolve( Artifact artifact ):
- call( * ArtifactResolver+.resolve( Artifact, ..) )
- && args( artifact, .. );
-
- after( MavenProject project, Artifact artifact ) throwing( ArtifactNotFoundException cause ):
- within_pm_downloadDependencies( project )
- && ar_resolve( artifact )
- {
- getReporter().reportProjectDependencyArtifactNotFound( project, artifact, cause );
- }
-
- after( MavenProject project, Artifact artifact ) throwing( ArtifactResolutionException cause ):
- within_pm_downloadDependencies( project )
- && ar_resolve( artifact )
- {
- getReporter().reportProjectDependencyArtifactUnresolvable( project, artifact, cause );
+ if ( cause instanceof MultipleArtifactsNotFoundException )
+ {
+ getReporter().reportProjectDependenciesNotFound( project, scope, (MultipleArtifactsNotFoundException) cause );
+ }
+ else
+ {
+ getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );
+ }
}
private pointcut le_getLifecycleBindings( List tasks, MavenProject configuringProject, String targetDescription ):
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java?rev=611974&r1=611973&r2=611974&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java Mon Jan 14 15:59:01 2008
@@ -7,6 +7,7 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -112,11 +113,9 @@
void reportProjectDependenciesNotFound( MavenProject project, String scope, ArtifactNotFoundException cause );
- void reportProjectDependenciesUnresolvable( MavenProject project, String scope, ArtifactResolutionException cause );
-
- void reportProjectDependencyArtifactNotFound( MavenProject project, Artifact artifact, ArtifactNotFoundException cause );
+ void reportProjectDependenciesNotFound( MavenProject project, String scope, MultipleArtifactsNotFoundException cause );
- void reportProjectDependencyArtifactUnresolvable( MavenProject project, Artifact artifact, ArtifactResolutionException cause );
+ void reportProjectDependenciesUnresolvable( MavenProject project, String scope, ArtifactResolutionException cause );
void reportProjectMojoFailureException( MavenSession session, MojoBinding binding, MojoFailureException cause );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java?rev=611974&r1=611973&r2=611974&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java Mon Jan 14 15:59:01 2008
@@ -10,6 +10,7 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.CyclicDependencyException;
+import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -643,25 +644,18 @@
reportTransitiveResolutionError( project, scope, cause );
}
- public void reportProjectDependenciesUnresolvable( MavenProject project,
- String scope,
- ArtifactResolutionException cause )
+ public void reportProjectDependenciesNotFound( MavenProject project,
+ String scope,
+ MultipleArtifactsNotFoundException cause )
{
reportTransitiveResolutionError( project, scope, cause );
}
- public void reportProjectDependencyArtifactNotFound( MavenProject project,
- Artifact artifact,
- ArtifactNotFoundException cause )
- {
- reportArtifactError( project, artifact, cause );
- }
-
- public void reportProjectDependencyArtifactUnresolvable( MavenProject project,
- Artifact artifact,
- ArtifactResolutionException cause )
+ public void reportProjectDependenciesUnresolvable( MavenProject project,
+ String scope,
+ ArtifactResolutionException cause )
{
- reportArtifactError( project, artifact, cause );
+ reportTransitiveResolutionError( project, scope, cause );
}
private void reportTransitiveResolutionError( MavenProject project,
@@ -687,24 +681,6 @@
writeProjectCoordinate( project, writer );
addTips( CoreErrorTips.getDependencyArtifactResolutionTips( project, scope, cause ),
- writer );
-
- registerBuildError( cause, writer.toString(), cause.getCause() );
- }
-
- private void reportArtifactError( MavenProject project,
- Artifact depArtifact,
- AbstractArtifactResolutionException cause )
- {
- StringWriter writer = new StringWriter();
-
- writer.write( NEWLINE );
- writer.write( "Maven could not resolve one of your project dependencies from the repository:" );
-
- writeArtifactInfo( depArtifact, cause, writer, true );
-
- writeProjectCoordinate( project, writer );
- addTips( CoreErrorTips.getDependencyArtifactResolutionTips( project, depArtifact, cause ),
writer );
registerBuildError( cause, writer.toString(), cause.getCause() );
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/pom.xml?rev=611974&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/pom.xml Mon Jan 14 15:59:01 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>testReportProjectDependenciesNotFound</artifactId>
+ <version>1</version>
+
+ <repositories>
+ <repository>
+ <id>central</id>
+ <url>file://${java.io.tmpdir}</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>not</groupId>
+ <artifactId>found</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/maven/test/error/mojoFailure/App.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/maven/test/error/mojoFailure/App.java?rev=611974&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/maven/test/error/mojoFailure/App.java (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/maven/test/error/mojoFailure/App.java Mon Jan 14 15:59:01 2008
@@ -0,0 +1,13 @@
+package org.apache.maven.test.error.mojoFailure;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/maven/test/error/mojoFailure/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/main/java/org/apache/maven/test/error/mojoFailure/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java?rev=611974&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java Mon Jan 14 15:59:01 2008
@@ -0,0 +1,38 @@
+package org.apache.maven.test.error.mojoFailure;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesNotFound/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/pom.xml?rev=611974&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/pom.xml Mon Jan 14 15:59:01 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>testReportProjectDependenciesUnresolvable</artifactId>
+ <version>1</version>
+
+ <repositories>
+ <repository>
+ <id>central</id>
+ <url>test://host/path</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>not</groupId>
+ <artifactId>found</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/maven/test/error/mojoFailure/App.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/maven/test/error/mojoFailure/App.java?rev=611974&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/maven/test/error/mojoFailure/App.java (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/maven/test/error/mojoFailure/App.java Mon Jan 14 15:59:01 2008
@@ -0,0 +1,13 @@
+package org.apache.maven.test.error.mojoFailure;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/maven/test/error/mojoFailure/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/main/java/org/apache/maven/test/error/mojoFailure/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java?rev=611974&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java Mon Jan 14 15:59:01 2008
@@ -0,0 +1,38 @@
+package org.apache.maven.test.error.mojoFailure;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java?rev=611974&r1=611973&r2=611974&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java Mon Jan 14 15:59:01 2008
@@ -5,6 +5,7 @@
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.DefaultConfiguration;
import org.apache.maven.embedder.MavenEmbedder;
@@ -216,31 +217,35 @@
fail( writer.toString() );
}
- // FIXME: Figure out how to keep the project-build error report from being the primary report...
public void testReportErrorResolvingExtensionDirectDependencies()
throws URISyntaxException, IOException
{
-// File projectDir = prepareProjectDir();
-// File localRepo = new File( projectDir, "local-repo" );
-// File project = new File( projectDir, "project" );
-//
-// reporter.reportErrorResolvingExtensionDirectDependencies( null, null, null, null, null );
-// reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
-// reporterCtl.setVoidCallable();
-//
-// reporterCtl.replay();
-//
-// MavenExecutionRequest request = new DefaultMavenExecutionRequest().setBaseDirectory( project )
-// .setLocalRepositoryPath( localRepo )
-// .setShowErrors( true )
-// .setErrorReporter( reporter )
-// .setGoals( Arrays.asList( new String[] {
-// "initialize"
-// } ) );
-//
-// maven.execute( request );
-//
-// reporterCtl.verify();
+ File projectDir = prepareProjectDir();
+ File localRepo = new File( projectDir, "local-repo" );
+ File project = new File( projectDir, "project" );
+
+ // TODO: Verify that the actual error reported is the one that identified the failing project as an extension POM.
+ reporter.reportBadDependencyVersion( null, null, null );
+ reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
+ reporterCtl.setVoidCallable();
+
+ reporter.reportErrorResolvingExtensionDirectDependencies( null, null, null, null, null );
+ reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
+ reporterCtl.setVoidCallable();
+
+ reporterCtl.replay();
+
+ MavenExecutionRequest request = new DefaultMavenExecutionRequest().setBaseDirectory( project )
+ .setLocalRepositoryPath( localRepo )
+ .setShowErrors( true )
+ .setErrorReporter( reporter )
+ .setGoals( Arrays.asList( new String[] {
+ "initialize"
+ } ) );
+
+ maven.execute( request );
+
+ reporterCtl.verify();
}
public void testReportAggregatedMojoFailureException()
@@ -613,27 +618,49 @@
}
public void testReportProjectDependenciesNotFound()
+ throws URISyntaxException, IOException
{
- // TODO Auto-generated method stub
+ File projectDir = prepareProjectDir();
+ reporter.reportProjectDependenciesNotFound( null, null, (MultipleArtifactsNotFoundException) null );
+ reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
+ reporterCtl.setVoidCallable();
+
+ reporterCtl.replay();
+
+ MavenExecutionRequest request = new DefaultMavenExecutionRequest().setBaseDirectory( projectDir )
+ .setShowErrors( true )
+ .setErrorReporter( reporter )
+ .setGoals( Arrays.asList( new String[] {
+ "compile"
+ } ) );
+
+ maven.execute( request );
+
+ reporterCtl.verify();
}
public void testReportProjectDependenciesUnresolvable()
+ throws URISyntaxException, IOException
{
- // TODO Auto-generated method stub
+ File projectDir = prepareProjectDir();
- }
+ reporter.reportProjectDependenciesUnresolvable( null, null, null );
+ reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
+ reporterCtl.setVoidCallable();
- public void testReportProjectDependencyArtifactNotFound()
- {
- // TODO Auto-generated method stub
+ reporterCtl.replay();
- }
+ MavenExecutionRequest request = new DefaultMavenExecutionRequest().setBaseDirectory( projectDir )
+ .setShowErrors( true )
+ .setErrorReporter( reporter )
+ .setGoals( Arrays.asList( new String[] {
+ "compile"
+ } ) );
- public void testReportProjectDependencyArtifactUnresolvable()
- {
- // TODO Auto-generated method stub
+ maven.execute( request );
+ reporterCtl.verify();
}
public void testReportProjectMojoFailureException()