You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2015/09/28 02:07:05 UTC
[2/4] maven-surefire git commit: [SUREFIRE] refactoring
[SUREFIRE] 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/32518764
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/32518764
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/32518764
Branch: refs/heads/master
Commit: 3251876425302dc6f21669d1754076fdc3a9c18c
Parents: 0d22ea7
Author: Tibor17 <ti...@lycos.com>
Authored: Mon Sep 28 00:27:41 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Mon Sep 28 00:27:41 2015 +0200
----------------------------------------------------------------------
.../maven/surefire/its/AggregateReportIT.java | 18 +++----
.../surefire/its/fixture/HelperAssertions.java | 49 +++++++++-----------
2 files changed, 33 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/32518764/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
index ee167df..ab8f64c 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
@@ -21,9 +21,14 @@ package org.apache.maven.surefire.its;
import java.io.File;
-import org.apache.maven.surefire.its.fixture.*;
+import org.apache.maven.surefire.its.fixture.IntegrationTestSuiteResults;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
import org.junit.Test;
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.parseTestResults;
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assertTestSuiteResults;
import static org.junit.Assert.assertTrue;
/**
@@ -39,17 +44,14 @@ public class AggregateReportIT
@Test
public void aggregateReport()
{
- final OutputValidator outputValidator =
- unpack( "/aggregate-report" ).addSurefireReportGoal().executeCurrentGoals();
+ OutputValidator outputValidator = unpack( "/aggregate-report" ).addSurefireReportGoal().executeCurrentGoals();
TestFile surefireReportHtml = outputValidator.getSiteFile( "surefire-report.html" );
assertTrue( "surefire report missing: " + surefireReportHtml.getAbsolutePath(), surefireReportHtml.exists() );
// TODO HtmlUnit tests on the surefire report
- File[] testDirs = new File[2];
- testDirs[0] = new File( outputValidator.getBaseDir(), "child1" );
- testDirs[1] = new File( outputValidator.getBaseDir(), "child2" );
- IntegrationTestSuiteResults suite = HelperAssertions.parseTestResults( testDirs );
- HelperAssertions.assertTestSuiteResults( 2, 0, 1, 0, suite );
+ IntegrationTestSuiteResults suite = parseTestResults( new File( outputValidator.getBaseDir(), "child1" ),
+ new File( outputValidator.getBaseDir(), "child2" ) );
+ assertTestSuiteResults( 2, 0, 1, 0, suite );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/32518764/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
index 4635b41..e202114 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
@@ -26,7 +26,8 @@ import java.util.Locale;
import org.apache.maven.plugins.surefire.report.ReportTestSuite;
import org.apache.maven.plugins.surefire.report.SurefireReportParser;
-import junit.framework.Assert;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.assertEquals;
@SuppressWarnings( { "JavaDoc" } )
public class HelperAssertions
@@ -36,19 +37,19 @@ public class HelperAssertions
*/
public static void assertTestSuiteResults( int total, int errors, int failures, int skipped, File testDir )
{
- IntegrationTestSuiteResults suite = parseTestResults( new File[]{ testDir } );
+ IntegrationTestSuiteResults suite = parseTestResults( testDir );
assertTestSuiteResults( total, errors, failures, skipped, suite );
}
public static void assertTestSuiteResults( int total, int errors, int failures, int skipped, int flakes, File testDir )
{
- IntegrationTestSuiteResults suite = parseTestResults( new File[]{ testDir } );
+ IntegrationTestSuiteResults suite = parseTestResults( testDir );
assertTestSuiteResults( total, errors, failures, skipped, flakes, suite );
}
public static void assertTestSuiteResults( int total, File testDir )
{
- IntegrationTestSuiteResults suite = parseTestResults( new File[]{ testDir } );
+ IntegrationTestSuiteResults suite = parseTestResults( testDir );
assertTestSuiteResults( total, suite );
}
@@ -58,44 +59,44 @@ public class HelperAssertions
public static void assertIntegrationTestSuiteResults( int total, int errors, int failures, int skipped,
File testDir )
{
- IntegrationTestSuiteResults suite = parseIntegrationTestResults( new File[]{ testDir } );
+ IntegrationTestSuiteResults suite = parseIntegrationTestResults( testDir );
assertTestSuiteResults( total, errors, failures, skipped, suite );
}
public static void assertIntegrationTestSuiteResults( int total, File testDir )
{
- IntegrationTestSuiteResults suite = parseIntegrationTestResults( new File[]{ testDir } );
+ IntegrationTestSuiteResults suite = parseIntegrationTestResults( testDir );
assertTestSuiteResults( total, suite );
}
public static void assertTestSuiteResults( int total, int errors, int failures, int skipped,
IntegrationTestSuiteResults actualSuite )
{
- Assert.assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
- Assert.assertEquals( "wrong number of errors", errors, actualSuite.getErrors() );
- Assert.assertEquals( "wrong number of failures", failures, actualSuite.getFailures() );
- Assert.assertEquals( "wrong number of skipped", skipped, actualSuite.getSkipped() );
+ assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
+ assertEquals( "wrong number of errors", errors, actualSuite.getErrors() );
+ assertEquals( "wrong number of failures", failures, actualSuite.getFailures() );
+ assertEquals( "wrong number of skipped", skipped, actualSuite.getSkipped() );
}
public static void assertTestSuiteResults( int total, IntegrationTestSuiteResults actualSuite )
{
- Assert.assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
+ assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
}
public static void assertTestSuiteResults( int total, int errors, int failures, int skipped, int flakes,
IntegrationTestSuiteResults actualSuite )
{
assertTestSuiteResults(total, errors, failures, skipped, actualSuite);
- Assert.assertEquals( "wrong number of flaky tests", flakes, actualSuite.getFlakes() );
+ assertEquals( "wrong number of flaky tests", flakes, actualSuite.getFlakes() );
}
- public static IntegrationTestSuiteResults parseTestResults( File[] testDirs )
+ public static IntegrationTestSuiteResults parseTestResults( File... testDirs )
{
List<ReportTestSuite> reports = extractReports( testDirs );
return parseReportList( reports );
}
- public static IntegrationTestSuiteResults parseIntegrationTestResults( File[] testDirs )
+ public static IntegrationTestSuiteResults parseIntegrationTestResults( File... testDirs )
{
List<ReportTestSuite> reports = extractITReports( testDirs );
return parseReportList( reports );
@@ -106,7 +107,7 @@ public class HelperAssertions
*/
public static IntegrationTestSuiteResults parseReportList( List<ReportTestSuite> reports )
{
- Assert.assertTrue( "No reports!", !reports.isEmpty() );
+ assertTrue( "No reports!", !reports.isEmpty() );
int total = 0, errors = 0, failures = 0, skipped = 0, flakes = 0;
for ( ReportTestSuite report : reports )
{
@@ -119,47 +120,43 @@ public class HelperAssertions
return new IntegrationTestSuiteResults( total, errors, failures, skipped, flakes );
}
- public static List<ReportTestSuite> extractReports( File[] testDirs )
+ public static List<ReportTestSuite> extractReports( File... testDirs )
{
List<File> reportsDirs = new ArrayList<File>();
for ( File testDir : testDirs )
{
File reportsDir = new File( testDir, "target/surefire-reports" );
- Assert.assertTrue( "Reports directory is missing: " + reportsDir.getAbsolutePath(), reportsDir.exists() );
+ assertTrue( "Reports directory is missing: " + reportsDir.getAbsolutePath(), reportsDir.exists() );
reportsDirs.add( reportsDir );
}
SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.getDefault() );
- List<ReportTestSuite> reports;
try
{
- reports = parser.parseXMLReportFiles();
+ return parser.parseXMLReportFiles();
}
catch ( Exception e )
{
throw new RuntimeException( "Couldn't parse XML reports", e );
}
- return reports;
}
- public static List<ReportTestSuite> extractITReports( File[] testDirs )
+ public static List<ReportTestSuite> extractITReports( File... testDirs )
{
List<File> reportsDirs = new ArrayList<File>();
for ( File testDir : testDirs )
{
File reportsDir = new File( testDir, "target/failsafe-reports" );
- Assert.assertTrue( "Reports directory is missing: " + reportsDir.getAbsolutePath(), reportsDir.exists() );
+ assertTrue( "Reports directory is missing: " + reportsDir.getAbsolutePath(), reportsDir.exists() );
reportsDirs.add( reportsDir );
}
- SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.getDefault() );
- List<ReportTestSuite> reports;
+ SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.getDefault() );
try
{
- reports = parser.parseXMLReportFiles();
+ return parser.parseXMLReportFiles();
}
catch ( Exception e )
{
throw new RuntimeException( "Couldn't parse XML reports", e );
}
- return reports;
}
}