Return-Path: Delivered-To: apmail-maven-surefire-commits-archive@www.apache.org Received: (qmail 90956 invoked from network); 15 Dec 2010 14:22:10 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Dec 2010 14:22:10 -0000 Received: (qmail 5631 invoked by uid 500); 15 Dec 2010 14:22:09 -0000 Delivered-To: apmail-maven-surefire-commits-archive@maven.apache.org Received: (qmail 5592 invoked by uid 500); 15 Dec 2010 14:22:08 -0000 Mailing-List: contact surefire-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: surefire-dev@maven.apache.org Delivered-To: mailing list surefire-commits@maven.apache.org Received: (qmail 5585 invoked by uid 99); 15 Dec 2010 14:22:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Dec 2010 14:22:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Dec 2010 14:22:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2947623888E7; Wed, 15 Dec 2010 14:21:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1049558 - in /maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its: AbstractSurefireIntegrationTestClass.java AggregateReportIT.java CheckTestNgReportTestIT.java Date: Wed, 15 Dec 2010 14:21:44 -0000 To: surefire-commits@maven.apache.org From: krosenvold@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101215142144.2947623888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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();