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 02:33:00 UTC

svn commit: r611992 - in /maven/components/trunk/maven-embedder/src/test: error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/ error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/child/ error-reportin...

Author: jdcasey
Date: Mon Jan 14 17:32:58 2008
New Revision: 611992

URL: http://svn.apache.org/viewvc?rev=611992&view=rev
Log:
two more error-reporting unit tests.

Added:
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/child/
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/child/pom.xml   (with props)
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/pom.xml   (with props)
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/child/
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/child/pom.xml   (with props)
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/pom.xml   (with props)
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/testReportErrorParsingParentProjectModel_IOException/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/child/pom.xml?rev=611992&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/child/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/child/pom.xml Mon Jan 14 17:32:58 2008
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>testReportErrorParsingParentProjectModel_IOException</artifactId>
+    <groupId>org.apache.maven.errortest</groupId>
+    <version>1</version>
+  </parent>
+  <artifactId>testReportErrorParsingParentProjectModel_IOException-child</artifactId>
+  
+</project>
\ No newline at end of file

Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/child/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/child/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/pom.xml?rev=611992&view=auto
==============================================================================
    (empty)

Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_IOException/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/child/pom.xml?rev=611992&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/child/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/child/pom.xml Mon Jan 14 17:32:58 2008
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>testReportErrorParsingParentProjectModel_XmlPullParserException</artifactId>
+    <groupId>org.apache.maven.errortest</groupId>
+    <version>1</version>
+  </parent>
+  <artifactId>testReportErrorParsingParentProjectModel_XmlPullParserException-child</artifactId>
+  
+</project>
\ No newline at end of file

Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/child/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/child/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/pom.xml?rev=611992&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/pom.xml Mon Jan 14 17:32:58 2008
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.errortest</groupId>
+  <artifactId>testReportErrorParsingParentProjectModel_XmlPullParserException</artifactId>
+  <version>1</ver>
+  
+</project>
\ No newline at end of file

Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingParentProjectModel_XmlPullParserException/pom.xml
------------------------------------------------------------------------------
    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=611992&r1=611991&r2=611992&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 17:32:58 2008
@@ -950,15 +950,51 @@
     }
 
     public void testReportErrorParsingParentProjectModel_XmlPullParserException()
+        throws URISyntaxException, IOException
     {
-        // TODO Auto-generated method stub
+        File projectDir = prepareProjectDir();
+        File childDir = new File( projectDir, "child" );
 
+        reporter.reportErrorParsingParentProjectModel( null, null, (XmlPullParserException) null );
+        reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
+        reporterCtl.setVoidCallable();
+
+        reporterCtl.replay();
+
+        MavenExecutionRequest request = new DefaultMavenExecutionRequest().setBaseDirectory( childDir )
+                                                                          .setShowErrors( true )
+                                                                          .setErrorReporter( reporter )
+                                                                          .setGoals( Arrays.asList( new String[] {
+                                                                              "initialize"
+                                                                          } ) );
+
+        maven.execute( request );
+
+        reporterCtl.verify();
     }
 
     public void testReportErrorParsingParentProjectModel_IOException()
+        throws URISyntaxException, IOException
     {
-        // TODO Auto-generated method stub
+        File projectDir = prepareProjectDir();
+        File childDir = new File( projectDir, "child" );
+
+        reporter.reportErrorParsingParentProjectModel( null, null, (IOException) null );
+        reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
+        reporterCtl.setVoidCallable();
+
+        reporterCtl.replay();
+
+        MavenExecutionRequest request = new DefaultMavenExecutionRequest().setBaseDirectory( childDir )
+                                                                          .setShowErrors( true )
+                                                                          .setErrorReporter( reporter )
+                                                                          .setGoals( Arrays.asList( new String[] {
+                                                                              "initialize"
+                                                                          } ) );
+
+        maven.execute( request );
 
+        reporterCtl.verify();
     }
 
     public void testReportErrorParsingProjectModel_XmlPullParserException()