svn commit: r675349 - /maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java

[jdcasey]

Author: jdcasey
Date: Wed Jul  9 14:42:49 2008
New Revision: 675349

URL: http://svn.apache.org/viewvc?rev=675349&view=rev
Log:
Improving the reliability of these two tests.

Modified:
    
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java

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=675349&r1=675348&r2=675349&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 Jul  9 14:42:49 2008
@@ -19,16 +19,6 @@
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
 import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
 import org.apache.maven.embedder.Configuration;
 import org.apache.maven.embedder.DefaultConfiguration;
@@ -44,6 +34,16 @@
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.easymock.MockControl;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+import junit.framework.TestCase;
+
 public class ErrorReporterPointcutTest
     extends TestCase
 {
@@ -55,6 +55,7 @@
 
     private String basedir;
 
+    @Override
     public void setUp()
         throws Exception
     {
@@ -81,6 +82,7 @@
         maven = new MavenEmbedder( configuration );
     }
 
+    @Override
     public void tearDown()
         throws Exception
     {
@@ -341,7 +343,7 @@
 
         reporter.reportErrorInterpolatingModel( null, null, null );
         reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
-        reporterCtl.setVoidCallable();
+        reporterCtl.setVoidCallable( MockControl.ONE_OR_MORE );
 
         reporterCtl.replay();
 
@@ -1170,18 +1172,14 @@
 
         buildTestAccessory( plugin );
 
-        Settings settings = new Settings();
-        settings.addPluginGroup( "org.apache.maven.errortest" );
-
         reporter.reportInvalidPluginForDirectInvocation( null, null, null, 
null );
         reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
         reporterCtl.setVoidCallable();
 
         reporterCtl.replay();
 
-        MavenExecutionRequest request =
-            createRequest( projectDir, reporter ).setSettings( settings 
).setGoals(
-                                                                               
     Arrays.asList( "missing-direct-invoke-mojo:test" ) );
+        MavenExecutionRequest request = createRequest( projectDir, reporter 
).setGoals( Arrays.asList( 
"org.apache.maven.errortest:missing-direct-invoke-mojo-maven-plugin:1:test" ) )
+                                                                             
.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_DEBUG );
 
         MavenExecutionResult result = maven.execute( request );
 
@@ -1201,18 +1199,13 @@
 
         buildTestAccessory( plugin );
 
-        Settings settings = new Settings();
-        settings.addPluginGroup( "org.apache.maven.errortest" );
-
         reporter.reportDuplicateAttachmentException( null, null, null );
         reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
         reporterCtl.setVoidCallable();
 
         reporterCtl.replay();
 
-        MavenExecutionRequest request =
-            createRequest( project, reporter ).setSettings( settings 
).setGoals(
-                                                                               
  Arrays.asList( "duplicated-attachments:test" ) );
+        MavenExecutionRequest request = createRequest( project, reporter 
).setGoals( Arrays.asList( 
"org.apache.maven.errortest:duplicated-attachments-maven-plugin:1:test" ) );
 
         MavenExecutionResult result = maven.execute( request );