svn commit: r1049558 - in /maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its: AbstractSurefireIntegrationTestClass.java AggregateReportIT.java CheckTestNgReportTestIT.java

[kr...@apache.org]

Author: krosenvold
Date: Wed Dec 15 14:21:43 2010
New Revision: 1049558

URL: http://svn.apache.org/viewvc?rev=1049558&view=rev
Log:
o Fixed test so it hits newly built plugin

The tests were testing the wrong version of the plugin, effectively invoking an old version
and not the SUT.

Modified:
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java?rev=1049558&r1=1049557&r2=1049558&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java Wed Dec 15 14:21:43 2010
@@ -99,4 +99,8 @@ public abstract class AbstractSurefireIn
         verifier.executeGoals( goals );
     }
 
+    protected String getSurefireVersion()
+    {
+        return surefireVersion;
+    }
 }

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java?rev=1049558&r1=1049557&r2=1049558&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java Wed Dec 15 14:21:43 2010
@@ -40,7 +40,7 @@ public class AggregateReportIT
 
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         List goals = this.getInitialGoals();
-        goals.add( "surefire-report:report" );
+        goals.add( "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report" );
         executeGoals( verifier, goals );
         //DGF even though the build will succeed, the log will contain errors (from the failure)
         //verifier.verifyErrorFreeLog();

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java?rev=1049558&r1=1049557&r2=1049558&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java Wed Dec 15 14:21:43 2010
@@ -38,7 +38,8 @@ public class CheckTestNgReportTestIT
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-simple" );
 
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        this.executeGoal( verifier, "surefire-report:report" );
+        this.executeGoal( verifier,
+                          "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();