Repository: maven-surefire Updated Branches: refs/heads/master 8b78618bc -> 97092f717
[SUREFIRE] IT refactoring Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/827dd1a2 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/827dd1a2 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/827dd1a2 Branch: refs/heads/master Commit: 827dd1a26f96b027835d4d98e925f189012bb884 Parents: 8b78618 Author: Tibor17 <tibo...@lycos.com> Authored: Tue Oct 13 00:44:59 2015 +0200 Committer: Tibor17 <tibo...@lycos.com> Committed: Tue Oct 13 00:44:59 2015 +0200 ---------------------------------------------------------------------- .../org/apache/maven/surefire/its/CheckTestNgVersionsIT.java | 4 +--- .../java/org/apache/maven/surefire/its/TwoTestCasesIT.java | 7 +++---- .../its/jiras/Surefire224WellFormedXmlFailuresIT.java | 4 +--- 3 files changed, 5 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/827dd1a2/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java index fb3a51e..49c0be7 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java @@ -19,7 +19,6 @@ package org.apache.maven.surefire.its; * under the License. */ -import java.io.File; import java.util.List; import org.apache.maven.plugins.surefire.report.ReportTestSuite; @@ -186,8 +185,7 @@ public class CheckTestNgVersionsIT if ( validateRunOrder ) { // assert correct run order of tests - List<ReportTestSuite> report = - HelperAssertions.extractReports( new File[] { outputValidator.getBaseDir() } ); + List<ReportTestSuite> report = HelperAssertions.extractReports( outputValidator.getBaseDir() ); assertEquals( 3, report.size() ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/827dd1a2/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java index 758c506..eca2fb0 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java @@ -19,7 +19,6 @@ package org.apache.maven.surefire.its; * under the License. */ -import java.io.File; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -54,7 +53,7 @@ public class TwoTestCasesIT { final OutputValidator outputValidator = unpack( "junit-twoTestCaseSuite" ).executeTest(); outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0, 0 ); - List<ReportTestSuite> reports = HelperAssertions.extractReports( new File[]{ outputValidator.getBaseDir() } ); + List<ReportTestSuite> reports = HelperAssertions.extractReports( outputValidator.getBaseDir() ); Set<String> classNames = extractClassNames( reports ); assertContains( classNames, "junit.twoTestCaseSuite.BasicTest" ); assertContains( classNames, "junit.twoTestCaseSuite.TestTwo" ); @@ -90,7 +89,7 @@ public class TwoTestCasesIT outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0, 0 ); List<ReportTestSuite> reports = - HelperAssertions.extractReports( ( new File[]{ outputValidator.getBaseDir() } ) ); + HelperAssertions.extractReports( outputValidator.getBaseDir() ); Set<String> classNames = extractClassNames( reports ); assertContains( classNames, "twoTestCaseSuite.BasicTest" ); assertContains( classNames, "twoTestCaseSuite.Junit4TestTwo" ); @@ -105,7 +104,7 @@ public class TwoTestCasesIT { final OutputValidator outputValidator = unpack( "testng-twoTestCaseSuite" ).executeTest(); outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0, 0 ); - List<ReportTestSuite> reports = HelperAssertions.extractReports( new File[]{ outputValidator.getBaseDir() } ); + List<ReportTestSuite> reports = HelperAssertions.extractReports( outputValidator.getBaseDir() ); Set<String> classNames = extractClassNames( reports ); assertContains( classNames, "testng.two.TestNGTestTwo" ); assertContains( classNames, "testng.two.TestNGSuiteTest" ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/827dd1a2/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java index 1118b85..1bdb3cb 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java @@ -26,7 +26,6 @@ import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.junit.Test; -import java.io.File; import java.util.List; import static org.junit.Assert.assertEquals; @@ -47,8 +46,7 @@ public class Surefire224WellFormedXmlFailuresIT outputValidator.assertTestSuiteResults( 4, 0, 4, 0 ); - ReportTestSuite suite = - HelperAssertions.extractReports( ( new File[]{ outputValidator.getBaseDir() } ) ).get( 0 ); + ReportTestSuite suite = HelperAssertions.extractReports( outputValidator.getBaseDir() ).get( 0 ); List<org.apache.maven.plugins.surefire.report.ReportTestCase> testCases = suite.getTestCases(); assertEquals( "Wrong number of test case objects", 4, testCases.size() ); ReportTestCase testQuote = null, testLower = null, testGreater = null, testU0000 = null;
