Return-Path: Delivered-To: apmail-maven-surefire-commits-archive@www.apache.org Received: (qmail 36325 invoked from network); 29 Apr 2008 23:28:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Apr 2008 23:28:46 -0000 Received: (qmail 63099 invoked by uid 500); 29 Apr 2008 23:28:48 -0000 Delivered-To: apmail-maven-surefire-commits-archive@maven.apache.org Received: (qmail 63068 invoked by uid 500); 29 Apr 2008 23:28:48 -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 63057 invoked by uid 99); 29 Apr 2008 23:28:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2008 16:28:48 -0700 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; Tue, 29 Apr 2008 23:28:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8EAB923889EF; Tue, 29 Apr 2008 16:28:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r652188 - in /maven/surefire/trunk: surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java Date: Tue, 29 Apr 2008 23:28:18 -0000 To: surefire-commits@maven.apache.org From: dfabulich@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080429232818.8EAB923889EF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dfabulich Date: Tue Apr 29 16:28:18 2008 New Revision: 652188 URL: http://svn.apache.org/viewvc?rev=652188&view=rev Log: [SUREFIRE-463] ClassCastException when using testng suiteXmlFile and forkMode=always Submitted by: Andreas Andreou Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java?rev=652188&r1=652187&r2=652188&view=diff ============================================================================== --- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java (original) +++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java Tue Apr 29 16:28:18 2008 @@ -407,7 +407,7 @@ for ( Iterator j = testSets.keySet().iterator(); j.hasNext(); ) { - String testSet = (String) j.next(); + Object testSet = j.next(); boolean showFooter = !j.hasNext() && !i.hasNext(); int result = forkSuite( testSuite, testSet, showHeading, showFooter, properties ); if ( result > globalResult ) @@ -479,13 +479,16 @@ return fork( properties, showHeading, showFooter ); } - private int forkSuite( Object[] testSuite, String testSet, boolean showHeading, boolean showFooter, + private int forkSuite( Object[] testSuite, Object testSet, boolean showHeading, boolean showFooter, Properties properties ) throws SurefireBooterForkException { setForkProperties( Collections.singletonList( testSuite ), properties ); - properties.setProperty( "testSet", testSet ); + if (testSet instanceof String) + { + properties.setProperty( "testSet", (String) testSet); + } return fork( properties, showHeading, showFooter ); } Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java?rev=652188&r1=652187&r2=652188&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java Tue Apr 29 16:28:18 2008 @@ -6,6 +6,8 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; +import java.util.Arrays; +import java.util.List; /** * Test simple TestNG suite XML file @@ -28,4 +30,18 @@ HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir ); } + + public void testTestNgSuiteXmlForkModeAlways() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-suite-xml" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + List goals = Arrays.asList( new String[] {"test", "-DforkMode=always"} ); + verifier.executeGoals( goals ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir ); + } }