Updated Branches: refs/heads/master a796ecc57 -> eae6ad8fd
added generics Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/eae6ad8f Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/eae6ad8f Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/eae6ad8f Branch: refs/heads/master Commit: eae6ad8fd5d7ec4c24e4cbfbf699e5909140e88c Parents: a796ecc Author: Hervé Boutemy <[email protected]> Authored: Tue Nov 6 03:38:00 2012 +0100 Committer: Hervé Boutemy <[email protected]> Committed: Tue Nov 6 03:38:00 2012 +0100 ---------------------------------------------------------------------- .../surefire/report/DirectConsoleOutput.java | 11 +- .../surefire/report/PrettyPrintXMLWriter.java | 8 +- .../surefire/report/StatelessXmlReporter.java | 2 +- .../maven/surefire/report/RunStatistics.java | 12 +- .../report/AbstractSurefireReportMojo.java | 11 +- .../plugins/surefire/report/ReportTestCase.java | 6 +- .../surefire/report/SurefireReportGenerator.java | 100 ++++++--------- .../surefire/report/SurefireReportParser.java | 25 ++--- .../surefire/report/TestSuiteXmlParser.java | 24 ++-- .../surefire/report/ReportTestSuiteTest.java | 2 +- .../surefire/report/SurefireReportParserTest.java | 29 ++--- .../surefire/report/TestSuiteXmlParserTest.java | 31 ++++- .../surefire/providerapi/SurefireProvider.java | 1 + .../maven/surefire/junit/JUnit3Provider.java | 4 +- 14 files changed, 133 insertions(+), 133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DirectConsoleOutput.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DirectConsoleOutput.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DirectConsoleOutput.java index ac00a7d..12f4e42 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DirectConsoleOutput.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DirectConsoleOutput.java @@ -37,22 +37,25 @@ public class DirectConsoleOutput private final PrintStream sout; private final PrintStream serr; - public DirectConsoleOutput(PrintStream sout, PrintStream serr) + public DirectConsoleOutput( PrintStream sout, PrintStream serr ) { this.sout = sout; this.serr = serr; } - public void writeTestOutput(byte[] buf, int off, int len, boolean stdout) { + public void writeTestOutput( byte[] buf, int off, int len, boolean stdout ) + { PrintStream stream = stdout ? sout : serr; stream.write(buf, off, len); } - public void testSetStarting(ReportEntry reportEntry) { + public void testSetStarting( ReportEntry reportEntry ) + { } - public void testSetCompleted(ReportEntry report) { + public void testSetCompleted( ReportEntry report ) + { } public void close() http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java index e4021c5..25f0c83 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java @@ -30,7 +30,7 @@ public class PrettyPrintXMLWriter { private final PrintWriter writer; - private final LinkedList elementStack = new LinkedList(); + private final LinkedList<String> elementStack = new LinkedList<String>(); private boolean tagInProgress; @@ -67,11 +67,13 @@ public class PrettyPrintXMLWriter } } - public void setEncoding(String encoding) { + public void setEncoding( String encoding ) + { throw new NotImplementedException(); } - public void setDocType(String docType) { + public void setDocType( String docType ) + { throw new NotImplementedException(); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java index 8ec63c5..11c0c47 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java @@ -280,7 +280,7 @@ public class StatelessXmlReporter if ( systemProperties != null ) { - Enumeration propertyKeys = systemProperties.propertyNames(); + Enumeration<?> propertyKeys = systemProperties.propertyNames(); while ( propertyKeys.hasMoreElements() ) { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/RunStatistics.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/RunStatistics.java b/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/RunStatistics.java index d232205..4ba81f0 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/RunStatistics.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/RunStatistics.java @@ -30,7 +30,8 @@ import org.apache.maven.surefire.util.internal.StringUtils; /** * @author Kristian Rosenvold */ -public class RunStatistics { +public class RunStatistics +{ /** * Holds the source(s) that causes the error(s). */ @@ -56,12 +57,12 @@ public class RunStatistics { failureSources.addSource( failureSource, stackTraceWriter ); } - public Collection getErrorSources() + public Collection<String> getErrorSources() { return errorSources.getListOfSources(); } - public Collection getFailureSources() + public Collection<String> getFailureSources() { return failureSources.getListOfSources(); } @@ -86,7 +87,8 @@ public class RunStatistics { return skipped; } - public synchronized void add( TestSetStats testSetStats){ + public synchronized void add( TestSetStats testSetStats ) + { this.completedCount += testSetStats.getCompletedCount(); this.errors += testSetStats.getErrors(); this.failures += testSetStats.getFailures(); @@ -131,7 +133,7 @@ public class RunStatistics { return i >= 0 ? str.substring( 0, i ) + "(..)" : str; } - Collection getListOfSources() + Collection<String> getListOfSources() { synchronized ( listOfSources ) { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java ---------------------------------------------------------------------- diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java index 590f8c7..90cfc31 100644 --- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java +++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java @@ -1,4 +1,5 @@ package org.apache.maven.plugins.surefire.report; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -168,9 +169,9 @@ public abstract class AbstractSurefireReportMojo if ( !isGeneratedWhenNoResults() ) { boolean atLeastOneDirectoryExists = false; - for ( Iterator i = reportsDirectoryList.iterator(); i.hasNext() && !atLeastOneDirectoryExists; ) + for ( Iterator<File> i = reportsDirectoryList.iterator(); i.hasNext() && !atLeastOneDirectoryExists; ) { - atLeastOneDirectoryExists = SurefireReportParser.hasReportFiles( (File) i.next() ); + atLeastOneDirectoryExists = SurefireReportParser.hasReportFiles( i.next() ); } if ( !atLeastOneDirectoryExists ) { @@ -191,7 +192,7 @@ public abstract class AbstractSurefireReportMojo return false; } - final List reportsDirectoryList = getReportsDirectories(); + final List<File> reportsDirectoryList = getReportsDirectories(); if ( reportsDirectoryList == null ) { @@ -201,9 +202,9 @@ public abstract class AbstractSurefireReportMojo if ( !isGeneratedWhenNoResults() ) { boolean atLeastOneDirectoryExists = false; - for ( Iterator i = reportsDirectoryList.iterator(); i.hasNext() && !atLeastOneDirectoryExists; ) + for ( Iterator<File> i = reportsDirectoryList.iterator(); i.hasNext() && !atLeastOneDirectoryExists; ) { - atLeastOneDirectoryExists = SurefireReportParser.hasReportFiles( (File) i.next() ); + atLeastOneDirectoryExists = SurefireReportParser.hasReportFiles( i.next() ); } if ( !atLeastOneDirectoryExists ) { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java ---------------------------------------------------------------------- diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java index 96290b2..3203f49 100644 --- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java +++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java @@ -37,7 +37,7 @@ public class ReportTestCase private float time; - private Map failure; + private Map<String, Object> failure; public String getName() { @@ -79,7 +79,7 @@ public class ReportTestCase this.time = time; } - public Map getFailure() + public Map<String, Object> getFailure() { return failure; } @@ -96,7 +96,7 @@ public class ReportTestCase public void addFailure( String message, String type ) { - failure = new HashMap(); + failure = new HashMap<String, Object>(); failure.put( "message", message ); failure.put( "type", type ); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java ---------------------------------------------------------------------- diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java index cb0bd93..10c124f 100644 --- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java +++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java @@ -23,7 +23,6 @@ import java.io.File; import java.text.NumberFormat; import java.util.Iterator; import java.util.List; -import java.util.ListIterator; import java.util.Locale; import java.util.Map; import java.util.ResourceBundle; @@ -88,7 +87,7 @@ public class SurefireReportGenerator constructSummarySection( bundle, sink ); - Map suitePackages = report.getSuitesGroupByPackage( testSuites ); + Map<String, List<ReportTestSuite>> suitePackages = report.getSuitesGroupByPackage( testSuites ); if ( !suitePackages.isEmpty() ) { constructPackagesSection( bundle, sink, suitePackages ); @@ -99,7 +98,7 @@ public class SurefireReportGenerator constructTestCasesSection( bundle, sink ); } - List failureList = report.getFailureDetails( testSuites ); + List<ReportTestCase> failureList = report.getFailureDetails( testSuites ); if ( !failureList.isEmpty() ) { constructFailureDetails( sink, bundle, failureList ); @@ -114,7 +113,7 @@ public class SurefireReportGenerator private void constructSummarySection( ResourceBundle bundle, Sink sink ) { - Map summary = report.getSummary( testSuites ); + Map<String, String> summary = report.getSummary( testSuites ); sink.section1(); sink.sectionTitle1(); @@ -149,17 +148,17 @@ public class SurefireReportGenerator sink.tableRow(); - sinkCell( sink, (String) summary.get( "totalTests" ) ); + sinkCell( sink, summary.get( "totalTests" ) ); - sinkCell( sink, (String) summary.get( "totalErrors" ) ); + sinkCell( sink, summary.get( "totalErrors" ) ); - sinkCell( sink, (String) summary.get( "totalFailures" ) ); + sinkCell( sink, summary.get( "totalFailures" ) ); - sinkCell( sink, (String) summary.get( "totalSkipped" ) ); + sinkCell( sink, summary.get( "totalSkipped" ) ); sinkCell( sink, summary.get( "totalPercentage" ) + "%" ); - sinkCell( sink, (String) summary.get( "totalElapsedTime" ) ); + sinkCell( sink, summary.get( "totalElapsedTime" ) ); sink.tableRow_(); @@ -178,7 +177,8 @@ public class SurefireReportGenerator sink.section1_(); } - private void constructPackagesSection( ResourceBundle bundle, Sink sink, Map suitePackages ) + private void constructPackagesSection( ResourceBundle bundle, Sink sink, + Map<String, List<ReportTestSuite>> suitePackages ) { NumberFormat numberFormat = report.getNumberFormat(); @@ -215,31 +215,29 @@ public class SurefireReportGenerator sink.tableRow_(); - Iterator packIter = suitePackages.keySet().iterator(); - - while ( packIter.hasNext() ) + for ( Map.Entry<String, List<ReportTestSuite>> entry: suitePackages.entrySet() ) { sink.tableRow(); - String packageName = (String) packIter.next(); + String packageName = entry.getKey(); - List testSuiteList = (List) suitePackages.get( packageName ); + List<ReportTestSuite> testSuiteList = entry.getValue(); - Map packageSummary = report.getSummary( testSuiteList ); + Map<String, String> packageSummary = report.getSummary( testSuiteList ); sinkCellLink( sink, packageName, "#" + packageName ); - sinkCell( sink, (String) packageSummary.get( "totalTests" ) ); + sinkCell( sink, packageSummary.get( "totalTests" ) ); - sinkCell( sink, (String) packageSummary.get( "totalErrors" ) ); + sinkCell( sink, packageSummary.get( "totalErrors" ) ); - sinkCell( sink, (String) packageSummary.get( "totalFailures" ) ); + sinkCell( sink, packageSummary.get( "totalFailures" ) ); - sinkCell( sink, (String) packageSummary.get( "totalSkipped" ) ); + sinkCell( sink, packageSummary.get( "totalSkipped" ) ); sinkCell( sink, packageSummary.get( "totalPercentage" ) + "%" ); - sinkCell( sink, (String) packageSummary.get( "totalElapsedTime" ) ); + sinkCell( sink, packageSummary.get( "totalElapsedTime" ) ); sink.tableRow_(); } @@ -254,15 +252,11 @@ public class SurefireReportGenerator sink.text( bundle.getString( "report.surefire.text.note2" ) ); sink.paragraph_(); - packIter = suitePackages.keySet().iterator(); - - while ( packIter.hasNext() ) + for ( Map.Entry<String, List<ReportTestSuite>> entry: suitePackages.entrySet() ) { - String packageName = (String) packIter.next(); - - List testSuiteList = (List) suitePackages.get( packageName ); + String packageName = entry.getKey(); - Iterator suiteIterator = testSuiteList.iterator(); + List<ReportTestSuite> testSuiteList = entry.getValue(); sink.section2(); sink.sectionTitle2(); @@ -273,10 +267,8 @@ public class SurefireReportGenerator boolean showTable = false; - while ( suiteIterator.hasNext() ) + for ( ReportTestSuite suite : testSuiteList ) { - ReportTestSuite suite = (ReportTestSuite) suiteIterator.next(); - if ( showSuccess || suite.getNumberOfErrors() != 0 || suite.getNumberOfFailures() != 0 ) { showTable = true; @@ -285,8 +277,6 @@ public class SurefireReportGenerator } } - suiteIterator = testSuiteList.iterator(); - if ( showTable ) { sink.table(); @@ -313,10 +303,8 @@ public class SurefireReportGenerator sink.tableRow_(); - while ( suiteIterator.hasNext() ) + for ( ReportTestSuite suite : testSuiteList ) { - ReportTestSuite suite = (ReportTestSuite) suiteIterator.next(); - if ( showSuccess || suite.getNumberOfErrors() != 0 || suite.getNumberOfFailures() != 0 ) { @@ -396,12 +384,10 @@ public class SurefireReportGenerator for ( ReportTestSuite suite : testSuites ) { - List testCases = suite.getTestCases(); + List<ReportTestCase> testCases = suite.getTestCases(); if ( testCases != null && !testCases.isEmpty() ) { - ListIterator caseIterator = testCases.listIterator(); - sink.section2(); sink.sectionTitle2(); sink.text( suite.getName() ); @@ -411,10 +397,8 @@ public class SurefireReportGenerator boolean showTable = false; - while ( caseIterator.hasNext() ) + for ( ReportTestCase testCase : testCases ) { - ReportTestCase testCase = (ReportTestCase) caseIterator.next(); - if ( testCase.getFailure() != null || showSuccess ) { showTable = true; @@ -423,25 +407,21 @@ public class SurefireReportGenerator } } - caseIterator = testCases.listIterator(); - if ( showTable ) { sink.table(); sink.tableRows( new int[]{ LEFT, LEFT, LEFT }, true ); - while ( caseIterator.hasNext() ) + for ( ReportTestCase testCase : testCases ) { - ReportTestCase testCase = (ReportTestCase) caseIterator.next(); - if ( testCase.getFailure() != null || showSuccess ) { sink.tableRow(); sink.tableCell(); - Map failure = testCase.getFailure(); + Map<String, Object> failure = testCase.getFailure(); if ( failure != null ) { @@ -510,7 +490,7 @@ public class SurefireReportGenerator sinkCell( sink, "" ); sink.tableRow_(); - List detail = (List) failure.get( "detail" ); + List<String> detail = (List<String>) failure.get( "detail" ); if ( detail != null ) { @@ -524,12 +504,10 @@ public class SurefireReportGenerator atts.addAttribute( SinkEventAttributes.STYLE, "display:none;" ); sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts ); - Iterator it = detail.iterator(); - sink.verbatim( null ); - while ( it.hasNext() ) + for ( String line: detail ) { - sink.text( it.next().toString() ); + sink.text( line ); sink.lineBreak(); } sink.verbatim_(); @@ -565,9 +543,9 @@ public class SurefireReportGenerator return id.replace( ".", "_" ); } - private void constructFailureDetails( Sink sink, ResourceBundle bundle, List failureList ) + private void constructFailureDetails( Sink sink, ResourceBundle bundle, List<ReportTestCase> failureList ) { - Iterator failIter = failureList.iterator(); + Iterator<ReportTestCase> failIter = failureList.iterator(); if ( failIter != null ) { @@ -588,9 +566,9 @@ public class SurefireReportGenerator while ( failIter.hasNext() ) { - ReportTestCase tCase = (ReportTestCase) failIter.next(); + ReportTestCase tCase = failIter.next(); - Map failure = tCase.getFailure(); + Map<String, Object> failure = tCase.getFailure(); sink.tableRow(); @@ -624,17 +602,15 @@ public class SurefireReportGenerator sink.tableRow_(); - List detail = (List) failure.get( "detail" ); + List<String> detail = (List<String>) failure.get( "detail" ); if ( detail != null ) { - Iterator it = detail.iterator(); - boolean firstLine = true; String techMessage = ""; - while ( it.hasNext() ) + for ( String line : detail ) { - techMessage = it.next().toString(); + techMessage = line; if ( firstLine ) { firstLine = false; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java ---------------------------------------------------------------------- diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java index 9d2e94e..adf0b3d 100644 --- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java +++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java @@ -27,7 +27,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.ListIterator; import java.util.Locale; import java.util.Map; import org.apache.maven.reporting.MavenReportException; @@ -126,12 +125,10 @@ public class SurefireReportParser return lineString.substring( 0, lineString.indexOf( "(" ) ); } - public Map getSummary( List suites ) + public Map<String, String> getSummary( List<ReportTestSuite> suites ) { Map<String, String> totalSummary = new HashMap<String, String>(); - ListIterator iter = suites.listIterator(); - int totalNumberOfTests = 0; int totalNumberOfErrors = 0; @@ -142,10 +139,8 @@ public class SurefireReportParser float totalElapsedTime = 0.0f; - while ( iter.hasNext() ) + for ( ReportTestSuite suite : suites ) { - ReportTestSuite suite = (ReportTestSuite) iter.next(); - totalNumberOfTests += suite.getNumberOfTests(); totalNumberOfErrors += suite.getNumberOfErrors(); @@ -190,16 +185,12 @@ public class SurefireReportParser return this.numberFormat; } - public Map getSuitesGroupByPackage( List testSuitesList ) + public Map<String, List<ReportTestSuite>> getSuitesGroupByPackage( List<ReportTestSuite> testSuitesList ) { - ListIterator iter = testSuitesList.listIterator(); - Map<String, List<ReportTestSuite>> suitePackage = new HashMap<String, List<ReportTestSuite>>(); - while ( iter.hasNext() ) + for ( ReportTestSuite suite : testSuitesList ) { - ReportTestSuite suite = (ReportTestSuite) iter.next(); - List<ReportTestSuite> suiteList = new ArrayList<ReportTestSuite>(); if ( suitePackage.get( suite.getPackageName() ) != null ) @@ -240,10 +231,12 @@ public class SurefireReportParser if ( testCaseList != null ) { - for (ReportTestCase tCase : testCaseList) { + for ( ReportTestCase tCase : testCaseList ) + { - if (tCase.getFailure() != null) { - failureDetailList.add(tCase); + if ( tCase.getFailure() != null ) + { + failureDetailList.add( tCase ); } } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java ---------------------------------------------------------------------- diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java index 8ccef56..191024a 100644 --- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java +++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java @@ -66,13 +66,15 @@ public class TestSuiteXmlParser throws ParserConfigurationException, SAXException, IOException { - File f = new File(xmlPath); + File f = new File( xmlPath ); - FileInputStream fileInputStream = new FileInputStream(f); + FileInputStream fileInputStream = new FileInputStream( f ); - try { - return parse(fileInputStream); - } finally + try + { + return parse( fileInputStream ); + } + finally { fileInputStream.close(); } @@ -152,7 +154,7 @@ public class TestSuiteXmlParser // if the testcase declares its own classname, it may need to belong to its own suite if ( fullClassName != null ) { - currentSuite = (ReportTestSuite) classesToSuites.get( fullClassName ); + currentSuite = classesToSuites.get( fullClassName ); if ( currentSuite == null ) { currentSuite = new ReportTestSuite(); @@ -216,13 +218,13 @@ public class TestSuiteXmlParser } else if ( "failure".equals( qName ) ) { - Map failure = testCase.getFailure(); + Map<String, Object> failure = testCase.getFailure(); failure.put( "detail", parseCause( currentElement.toString() ) ); } else if ( "error".equals( qName ) ) { - Map error = testCase.getFailure(); + Map<String, Object> error = testCase.getFailure(); error.put( "detail", parseCause( currentElement.toString() ) ); } @@ -255,17 +257,17 @@ public class TestSuiteXmlParser } } - private List parseCause( String detail ) + private List<String> parseCause( String detail ) { String fullName = testCase.getFullName(); String name = fullName.substring( fullName.lastIndexOf( "." ) + 1 ); return parseCause( detail, name ); } - private List parseCause( String detail, String compareTo ) + private List<String> parseCause( String detail, String compareTo ) { StringTokenizer stringTokenizer = new StringTokenizer( detail, "\n" ); - List parsedDetail = new ArrayList( stringTokenizer.countTokens() ); + List<String> parsedDetail = new ArrayList<String>( stringTokenizer.countTokens() ); while ( stringTokenizer.hasMoreTokens() ) { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java ---------------------------------------------------------------------- diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java index 9a2e5f2..63e6eac 100644 --- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java +++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java @@ -58,7 +58,7 @@ public class ReportTestSuiteTest { ReportTestCase tCase = new ReportTestCase(); - List tCaseList = new ArrayList(); + List<ReportTestCase> tCaseList = new ArrayList<ReportTestCase>(); tCaseList.add( tCase ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java ---------------------------------------------------------------------- diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java index 687f32d..2bd5248 100644 --- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java +++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java @@ -25,7 +25,6 @@ import java.net.URL; import java.net.URLDecoder; import java.text.NumberFormat; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -70,14 +69,12 @@ public class SurefireReportParserTest { report.setReportsDirectory( getTestDir( "/test-reports" ) ); - List suites = report.parseXMLReportFiles(); + List<ReportTestSuite> suites = report.parseXMLReportFiles(); assertEquals( 8, suites.size() ); - Iterator it = suites.iterator(); - while ( it.hasNext() ) + for ( ReportTestSuite suite : suites ) { - ReportTestSuite suite = (ReportTestSuite) it.next(); assertNotNull( suite.getName() + " was not correctly parsed", suite.getTestCases() ); assertNotNull( suite.getName() ); assertNotNull( suite.getPackageName() ); @@ -134,13 +131,13 @@ public class SurefireReportParserTest tSuite2.setNumberOfTests( 100 ); - List suiteList = new ArrayList(); + List<ReportTestSuite> suiteList = new ArrayList<ReportTestSuite>(); suiteList.add( tSuite1 ); suiteList.add( tSuite2 ); - Map testMap = report.getSummary( suiteList ); + Map<String, String> testMap = report.getSummary( suiteList ); assertEquals( 20, Integer.parseInt( testMap.get( "totalErrors" ).toString() ) ); @@ -171,7 +168,7 @@ public class SurefireReportParserTest tSuite3.setPackageName( "Package2" ); - List suiteList = new ArrayList(); + List<ReportTestSuite> suiteList = new ArrayList<ReportTestSuite>(); suiteList.add( tSuite1 ); @@ -179,15 +176,15 @@ public class SurefireReportParserTest suiteList.add( tSuite3 ); - Map groupMap = report.getSuitesGroupByPackage( suiteList ); + Map<String, List<ReportTestSuite>> groupMap = report.getSuitesGroupByPackage( suiteList ); assertEquals( 2, groupMap.size() ); - assertEquals( tSuite1, ( (List) groupMap.get( "Package1" ) ).get( 0 ) ); + assertEquals( tSuite1, groupMap.get( "Package1" ).get( 0 ) ); - assertEquals( tSuite2, ( (List) groupMap.get( "Package1" ) ).get( 1 ) ); + assertEquals( tSuite2, groupMap.get( "Package1" ).get( 1 ) ); - assertEquals( tSuite3, ( (List) groupMap.get( "Package2" ) ).get( 0 ) ); + assertEquals( tSuite3, groupMap.get( "Package2" ).get( 0 ) ); } public void testComputePercentage() @@ -214,9 +211,9 @@ public class SurefireReportParserTest tCase3.addFailure( null, null ); - List tCaseList = new ArrayList(); + List<ReportTestCase> tCaseList = new ArrayList<ReportTestCase>(); - List tCaseList2 = new ArrayList(); + List<ReportTestCase> tCaseList2 = new ArrayList<ReportTestCase>(); tCaseList.add( tCase1 ); @@ -228,13 +225,13 @@ public class SurefireReportParserTest tSuite2.setTestCases( tCaseList2 ); - List suiteList = new ArrayList(); + List<ReportTestSuite> suiteList = new ArrayList<ReportTestSuite>(); suiteList.add( tSuite1 ); suiteList.add( tSuite2 ); - List failList = report.getFailureDetails( suiteList ); + List<ReportTestCase> failList = report.getFailureDetails( suiteList ); assertEquals( 2, failList.size() ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java ---------------------------------------------------------------------- diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java index b009570..2111920 100644 --- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java +++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java @@ -1,5 +1,24 @@ package org.apache.maven.plugins.surefire.report; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import junit.framework.TestCase; import java.io.ByteArrayInputStream; @@ -9,8 +28,12 @@ import java.util.Collection; /** * @author Kristian Rosenvold */ -public class TestSuiteXmlParserTest extends TestCase { - public void testParse() throws Exception { +public class TestSuiteXmlParserTest + extends TestCase +{ + public void testParse() + throws Exception + { TestSuiteXmlParser testSuiteXmlParser = new TestSuiteXmlParser(); String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + "<testsuite failures=\"4\" time=\"0.005\" errors=\"0\" skipped=\"0\" tests=\"4\" name=\"wellFormedXmlFailures.TestSurefire3\">\n" + @@ -43,7 +66,7 @@ public class TestSuiteXmlParserTest extends TestCase { "</failure>\n" + " </testcase>\n" + "</testsuite>"; - InputStream byteArrayIs = new ByteArrayInputStream(xml.getBytes()); - Collection<ReportTestSuite> parse = testSuiteXmlParser.parse(byteArrayIs); + InputStream byteArrayIs = new ByteArrayInputStream( xml.getBytes() ); + Collection<ReportTestSuite> parse = testSuiteXmlParser.parse( byteArrayIs ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java index d457e99..4f13148 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java @@ -1,4 +1,5 @@ package org.apache.maven.surefire.providerapi; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eae6ad8f/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java index 6818db8..ff39099 100644 --- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java +++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java @@ -76,7 +76,7 @@ public class JUnit3Provider { if ( testsToRun == null ) { - testsToRun = forkTestSet == null ? scanClassPath() : TestsToRun.fromClass( (Class) forkTestSet ); + testsToRun = forkTestSet == null ? scanClassPath() : TestsToRun.fromClass( (Class<?>) forkTestSet ); } ReporterFactory reporterFactory = providerParameters.getReporterFactory(); @@ -101,7 +101,7 @@ public class JUnit3Provider return reporterFactory.close(); } - private SurefireTestSet createTestSet( Class clazz ) + private SurefireTestSet createTestSet( Class<?> clazz ) throws TestSetFailedException { return reflector.isJUnit3Available() && jUnit3TestChecker.accept( clazz )
