Author: krosenvold
Date: Mon Dec 5 21:44:00 2011
New Revision: 1210654
URL: http://svn.apache.org/viewvc?rev=1210654&view=rev
Log:
o Added some generics
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestSuite.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/TestSuiteXmlParser.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java?rev=1210654&r1=1210653&r2=1210654&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java
Mon Dec 5 21:44:00 2011
@@ -18,12 +18,10 @@ package org.apache.maven.surefire.its.mi
* under the License.
*/
-import org.apache.maven.surefire.its.IntegrationTestSuiteResults;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
+import org.apache.maven.surefire.its.IntegrationTestSuiteResults;
import junit.framework.Assert;
@@ -66,13 +64,12 @@ public class HelperAssertions
{
Assert.assertTrue( "No reports!", reports.size() > 0 );
int total = 0, errors = 0, failures = 0, skipped = 0;
- for ( int i = 0; i < reports.size(); i++ )
+ for ( ReportTestSuite report : reports )
{
- ReportTestSuite suite = (ReportTestSuite) reports.get( i );
- total += suite.getNumberOfTests();
- errors += suite.getNumberOfErrors();
- failures += suite.getNumberOfFailures();
- skipped += suite.getNumberOfSkipped();
+ total += report.getNumberOfTests();
+ errors += report.getNumberOfErrors();
+ failures += report.getNumberOfFailures();
+ skipped += report.getNumberOfSkipped();
}
return new IntegrationTestSuiteResults( total, errors, failures,
skipped );
}
@@ -80,14 +77,13 @@ public class HelperAssertions
public static List<ReportTestSuite> extractReports( File[] testDirs )
{
List<File> reportsDirs = new ArrayList<File>();
- for ( int i = 0; i < testDirs.length; i++ )
+ for ( File testDir : testDirs )
{
- File testDir = testDirs[i];
File reportsDir = new File( testDir, "target/surefire-reports" );
Assert.assertTrue( "Reports directory is missing: " +
reportsDir.getAbsolutePath(), reportsDir.exists() );
reportsDirs.add( reportsDir );
}
- SurefireReportParser parser = new SurefireReportParser( reportsDirs,
Locale.getDefault() );
+ SurefireReportParser parser = new SurefireReportParser( reportsDirs );
List<ReportTestSuite> reports;
try
{
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java?rev=1210654&r1=1210653&r2=1210654&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java
Mon Dec 5 21:44:00 2011
@@ -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 );
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestSuite.java?rev=1210654&r1=1210653&r2=1210654&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestSuite.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestSuite.java
Mon Dec 5 21:44:00 2011
@@ -27,7 +27,7 @@ import java.util.List;
*/
public class ReportTestSuite
{
- private List testCases = new ArrayList();
+ private List<ReportTestCase> testCases = new ArrayList<ReportTestCase>();
private int numberOfErrors;
@@ -45,7 +45,7 @@ public class ReportTestSuite
private float timeElapsed;
- public List getTestCases()
+ public List<ReportTestCase> getTestCases()
{
return this.testCases;
}
@@ -84,7 +84,7 @@ public class ReportTestSuite
{
if ( numberOfTests != null )
{
- return numberOfTests.intValue();
+ return numberOfTests;
}
if ( testCases != null )
{
@@ -95,7 +95,7 @@ public class ReportTestSuite
public void setNumberOfTests( int numberOfTests )
{
- this.numberOfTests = new Integer( numberOfTests );
+ this.numberOfTests = numberOfTests;
}
public String getName()
@@ -151,7 +151,7 @@ public class ReportTestSuite
this.timeElapsed = timeElapsed;
}
- public void setTestCases( List testCases )
+ public void setTestCases( List<ReportTestCase> testCases )
{
this.testCases = testCases;
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java?rev=1210654&r1=1210653&r2=1210654&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java
Mon Dec 5 21:44:00 2011
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Locale;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.StringUtils;
@@ -38,45 +37,41 @@ import org.xml.sax.SAXException;
public class SurefireReportParser
{
- private final List reportsDirectories;
+ private final List<File> reportsDirectories;
- private final List testSuites = new ArrayList();
+ private final List<ReportTestSuite> testSuites = new
ArrayList<ReportTestSuite>();
- public SurefireReportParser( List reportsDirectoriesFiles, Locale locale )
+ public SurefireReportParser( List<File> reportsDirectoriesFiles )
{
this.reportsDirectories = reportsDirectoriesFiles;
}
- public List parseXMLReportFiles()
+ public List<ReportTestSuite> parseXMLReportFiles()
{
- List xmlReportFileList = new ArrayList();
- for ( int i = 0; i < reportsDirectories.size(); i++ )
+ List<File> xmlReportFileList = new ArrayList<File>();
+ for ( File reportsDirectory : reportsDirectories )
{
- File reportsDirectory = (File) reportsDirectories.get( i );
if ( !reportsDirectory.exists() )
{
continue;
}
- String[] xmlReportFiles =
- getIncludedFiles( reportsDirectory, "*.xml",
- "*.txt, testng-failed.xml,
testng-failures.xml, testng-results.xml" );
- for ( int j = 0; j < xmlReportFiles.length; j++ )
+ String[] xmlReportFiles = getIncludedFiles( reportsDirectory,
"*.xml",
+ "*.txt,
testng-failed.xml, testng-failures.xml, testng-results.xml" );
+ for ( String xmlReportFile : xmlReportFiles )
{
- File xmlReport = new File( reportsDirectory, xmlReportFiles[j]
);
+ File xmlReport = new File( reportsDirectory, xmlReportFile );
xmlReportFileList.add( xmlReport );
}
}
TestSuiteXmlParser parser = new TestSuiteXmlParser();
- for ( int index = 0; index < xmlReportFileList.size(); index++ )
+ for ( File aXmlReportFileList : xmlReportFileList )
{
- Collection suites;
-
- File currentReport = (File) xmlReportFileList.get( index );
+ Collection<ReportTestSuite> suites;
try
{
- suites = parser.parse( currentReport.getAbsolutePath() );
+ suites = parser.parse( aXmlReportFileList.getAbsolutePath() );
}
catch ( ParserConfigurationException e )
{
@@ -84,11 +79,11 @@ public class SurefireReportParser
}
catch ( SAXException e )
{
- throw new RuntimeException( "Error parsing JUnit XML report "
+ currentReport, e );
+ throw new RuntimeException( "Error parsing JUnit XML report "
+ aXmlReportFileList, e );
}
catch ( IOException e )
{
- throw new RuntimeException( "Error reading JUnit XML report "
+ currentReport, e );
+ throw new RuntimeException( "Error reading JUnit XML report "
+ aXmlReportFileList, e );
}
testSuites.addAll( suites );
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/TestSuiteXmlParser.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/TestSuiteXmlParser.java?rev=1210654&r1=1210653&r2=1210654&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/TestSuiteXmlParser.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/TestSuiteXmlParser.java
Mon Dec 5 21:44:00 2011
@@ -19,12 +19,6 @@ package org.apache.maven.surefire.its.mi
* under the License.
*/
-import org.apache.maven.surefire.its.misc.ReportTestCase;
-import org.apache.maven.surefire.its.misc.ReportTestSuite;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
import java.io.File;
import java.io.IOException;
import java.text.NumberFormat;
@@ -36,6 +30,10 @@ import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -48,7 +46,7 @@ public class TestSuiteXmlParser
{
private ReportTestSuite defaultSuite;
private ReportTestSuite currentSuite;
- private Map classesToSuites;
+ private Map<String, ReportTestSuite> classesToSuites;
private final NumberFormat numberFormat = NumberFormat.getInstance();
/**
@@ -58,14 +56,14 @@ public class TestSuiteXmlParser
private ReportTestCase testCase;
- public Collection parse( String xmlPath )
+ public Collection<ReportTestSuite> parse( String xmlPath )
throws ParserConfigurationException, SAXException, IOException
{
SAXParserFactory factory = SAXParserFactory.newInstance();
SAXParser saxParser = factory.newSAXParser();
- classesToSuites = new HashMap();
+ classesToSuites = new HashMap<String, ReportTestSuite>();
saxParser.parse( new File( xmlPath ), this );
@@ -145,7 +143,7 @@ public class TestSuiteXmlParser
String timeAsString = attributes.getValue( "time" );
- Number time = new Integer( 0 );
+ Number time = 0;
if ( timeAsString != null )
{
@@ -191,7 +189,7 @@ public class TestSuiteXmlParser
}
else if ( "failure".equals( qName ) )
{
- Map failure = testCase.getFailure();
+ Map<String, Object> failure = testCase.getFailure();
failure.put( "detail", parseCause( currentElement.toString() ) );
}
