Author: jdcasey
Date: Wed Jan 16 07:55:08 2008
New Revision: 612493
URL: http://svn.apache.org/viewvc?rev=612493&view=rev
Log:
Adding the remaining project-related error reporting unit tests.
Added:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportParentPomArtifactNotFound/pom.xml
(with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/maven/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/maven/errortest/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/maven/errortest/dep/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/maven/errortest/dep/1/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom
(with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/project/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/project/pom.xml
- copied, changed from r611974,
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/project/src/
- copied from r611974,
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/
Removed:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/pom.xml
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/src/
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
Added:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportParentPomArtifactNotFound/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportParentPomArtifactNotFound/pom.xml?rev=612493&view=auto
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportParentPomArtifactNotFound/pom.xml
(added)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportParentPomArtifactNotFound/pom.xml
Wed Jan 16 07:55:08 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>testReportParentPomArtifactNotFound-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <artifactId>testReportParentPomArtifactNotFound</artifactId>
+
+</project>
\ No newline at end of file
Propchange:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportParentPomArtifactNotFound/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportParentPomArtifactNotFound/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom?rev=612493&view=auto
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom
(added)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom
Wed Jan 16 07:55:08 2008
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>dep</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>[4.0,4.1]</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/project/pom.xml
(from r611974,
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/project/pom.xml?p2=maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/project/pom.xml&p1=maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/pom.xml&r1=611974&r2=612493&rev=612493&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectDependenciesUnresolvable/project/pom.xml
Wed Jan 16 07:55:08 2008
@@ -4,18 +4,17 @@
<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>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>[3.8.1,3.8.2]</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>dep</artifactId>
+ <version>1</version>
+ <type>pom</type>
</dependency>
</dependencies>
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=612493&r1=612492&r2=612493&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
Wed Jan 16 07:55:08 2008
@@ -667,28 +667,35 @@
reporterCtl.verify();
}
- // FIXME: Get the wagon to fail (in a way other than 'not found')
public void testReportProjectDependenciesUnresolvable()
throws IOException
{
-// File projectDir = prepareProjectDir();
-//
-// reporter.reportProjectDependenciesUnresolvable( null, null, 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();
+ if ( !checkOnline() )
+ {
+ return;
+ }
+
+ File projectDir = prepareProjectDir();
+ File localRepo = new File( projectDir, "local-repo" );
+ File project = new File( projectDir, "project" );
+
+ reporter.reportProjectDependenciesUnresolvable( null, null, null );
+ reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
+ reporterCtl.setVoidCallable();
+
+ reporterCtl.replay();
+
+ MavenExecutionRequest request = new
DefaultMavenExecutionRequest().setBaseDirectory( project )
+
.setShowErrors( true )
+
.setLocalRepositoryPath( localRepo )
+
.setErrorReporter( reporter )
+
.setGoals( Arrays.asList( new String[] {
+
"compile"
+ } )
);
+
+ maven.execute( request );
+
+ reporterCtl.verify();
}
public void testReportProjectMojoFailureException()
@@ -739,7 +746,6 @@
}
- // FIXME: How can I test this when it's masked by
reportActivatorErrorWhileGettingRepositoriesFromProfiles?
public void testReportActivatorError()
throws IOException
{
@@ -754,17 +760,11 @@
MavenExecutionRequest request = new
DefaultMavenExecutionRequest().setBaseDirectory( projectDir )
.setShowErrors( true )
.setErrorReporter( reporter )
-//
.setErrorReporter( new DummyCoreErrorReporter() )
.setGoals( Arrays.asList( new String[] {
"initialize"
} )
);
- MavenExecutionResult result = maven.execute( request );
-
-// if ( result.hasExceptions() )
-// {
-// reportExceptions( result, projectDir );
-// }
+ maven.execute( request );
reporterCtl.verify();
}
@@ -792,17 +792,11 @@
MavenExecutionRequest request = new
DefaultMavenExecutionRequest().setBaseDirectory( project )
.setShowErrors( true )
.setErrorReporter( reporter )
-//
.setErrorReporter( new DummyCoreErrorReporter() )
.setGoals( Arrays.asList( new String[] {
"initialize"
} )
);
- MavenExecutionResult result = maven.execute( request );
-
-// if ( result.hasExceptions() )
-// {
-// reportExceptions( result, project );
-// }
+ maven.execute( request );
reporterCtl.verify();
}
@@ -1110,34 +1104,33 @@
reporterCtl.verify();
}
- // TODO: Finish this test!
public void testReportParentPomArtifactNotFound()
throws IOException
{
-// File projectDir = prepareProjectDir();
-//
-//
reporter.reportInvalidRepositoryWhileGettingRepositoriesFromProfiles( null,
null, null, 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[] {
-//
"initialize"
-// }
) );
-//
-// maven.execute( request );
-//
-// reporterCtl.verify();
- }
+ File projectDir = prepareProjectDir();
+ File localRepo = new File( projectDir, "local-repo" );
- public void testReportParentPomArtifactUnresolvable()
- {
- // TODO Auto-generated method stub
+ Settings settings = new Settings();
+ settings.setLocalRepository( localRepo.getAbsolutePath() );
+ settings.setOffline( true );
+
+ reporter.reportParentPomArtifactNotFound( null, null, null, null,
null, null );
+ reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
+ reporterCtl.setVoidCallable();
+ reporterCtl.replay();
+
+ MavenExecutionRequest request = new
DefaultMavenExecutionRequest().setBaseDirectory( projectDir )
+
.setSettings( settings )
+
.setShowErrors( true )
+
.setErrorReporter( reporter )
+
.setGoals( Arrays.asList( new String[] {
+
"initialize"
+ } )
);
+
+ maven.execute( request );
+
+ reporterCtl.verify();
}
public void testReportProjectCollision()
