Repository: maven-surefire Updated Branches: refs/heads/master 2e62ff472 -> 5d61287af
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java index 80baa97..7f5d347 100644 --- a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java +++ b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java @@ -1,4 +1,5 @@ package org.apache.maven.surefire.testng.utils; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -31,6 +32,10 @@ import org.testng.IMethodSelector; import org.testng.IMethodSelectorContext; import org.testng.ITestNGMethod; +/** + * Method selector delegating to {@link GroupMatcher} to decide if a method is included or not. + * + */ public class GroupMatcherMethodSelector implements IMethodSelector { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java index 3c06bca..bf42daa 100644 --- a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java +++ b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java @@ -37,11 +37,11 @@ public class MethodSelector implements IMethodSelector { - private static String METHOD_NAME = null; + private static String methodName = null; public void setTestMethods( List arg0 ) { - // noop + // noop } public boolean includeMethod( IMethodSelectorContext context, ITestNGMethod testngMethod, boolean isTestMethod ) @@ -59,11 +59,11 @@ public class MethodSelector return true; } - return SelectorUtils.match( METHOD_NAME, testngMethod.getMethodName() ); + return SelectorUtils.match( methodName, testngMethod.getMethodName() ); } public static void setMethodName( String methodName ) { - METHOD_NAME = methodName; + MethodSelector.methodName = methodName; } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java index 62286eb..d30ad3c 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java @@ -76,8 +76,9 @@ public class TestNGDirectoryTestSuite private Class<? extends Annotation> junitTestAnnotation; - public TestNGDirectoryTestSuite( String testSourceDirectory, Properties confOptions, File reportsDirectory, String testMethodPattern, - RunOrderCalculator runOrderCalculator, ScanResult scanResult ) + public TestNGDirectoryTestSuite( String testSourceDirectory, Properties confOptions, File reportsDirectory, + String testMethodPattern, RunOrderCalculator runOrderCalculator, + ScanResult scanResult ) { this.runOrderCalculator = runOrderCalculator; @@ -95,7 +96,7 @@ public class TestNGDirectoryTestSuite } public void execute( TestsToRun testsToRun, ReporterFactory reporterManagerFactory ) - throws ReporterException, TestSetFailedException + throws TestSetFailedException { if ( !testsToRun.allowEagerReading() ) @@ -132,7 +133,7 @@ public class TestNGDirectoryTestSuite } public void executeLazy( TestsToRun testsToRun, ReporterFactory reporterFactory ) - throws ReporterException, TestSetFailedException + throws TestSetFailedException { for ( Class c : testsToRun ) @@ -171,7 +172,7 @@ public class TestNGDirectoryTestSuite } public void executeMulti( TestsToRun testsToRun, ReporterFactory reporterFactory ) - throws ReporterException, TestSetFailedException + throws TestSetFailedException { List<Class> testNgTestClasses = new ArrayList<Class>(); List<Class> junitTestClasses = new ArrayList<Class>(); @@ -260,7 +261,7 @@ public class TestNGDirectoryTestSuite // single class test public void execute( String testSetName, ReporterFactory reporterManagerFactory ) - throws ReporterException, TestSetFailedException + throws TestSetFailedException { if ( testSets == null ) { @@ -278,7 +279,8 @@ public class TestNGDirectoryTestSuite startTestSuite( reporter, this ); - TestNGExecutor.run( new Class[]{ testSet.getTestClass() }, this.testSourceDirectory, this.options, reporter, this, reportsDirectory, testMethodPattern ); + TestNGExecutor.run( new Class[] { testSet.getTestClass() }, this.testSourceDirectory, this.options, reporter, + this, reportsDirectory, testMethodPattern ); finishTestSuite( reporter, this ); } @@ -298,7 +300,6 @@ public class TestNGDirectoryTestSuite } public static void finishTestSuite( RunListener reporterManager, Object suite ) - throws ReporterException { ReportEntry report = new SimpleReportEntry( suite.getClass().getName(), getSuiteName( suite ) ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java index 5655739..b3801fe 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java @@ -175,6 +175,7 @@ public class TestNGExecutor } } + @SuppressWarnings( "checkstyle:magicnumber" ) private static XmlMethodSelector getMethodNameFilteringSelector( String methodNamePattern ) throws TestSetFailedException { @@ -226,6 +227,7 @@ public class TestNGExecutor return xms; } + @SuppressWarnings( "checkstyle:magicnumber" ) private static XmlMethodSelector getGroupMatchingSelector( Map options ) throws TestSetFailedException { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java index 1f28a29..5d89d35 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java @@ -24,7 +24,6 @@ import java.util.Properties; import org.apache.maven.surefire.providerapi.AbstractProvider; import org.apache.maven.surefire.providerapi.ProviderParameters; import org.apache.maven.surefire.report.ReporterConfiguration; -import org.apache.maven.surefire.report.ReporterException; import org.apache.maven.surefire.report.ReporterFactory; import org.apache.maven.surefire.suite.RunResult; import org.apache.maven.surefire.testset.TestRequest; @@ -73,7 +72,7 @@ public class TestNGProvider } public RunResult invoke( Object forkTestSet ) - throws TestSetFailedException, ReporterException + throws TestSetFailedException { final ReporterFactory reporterFactory = providerParameters.getReporterFactory(); @@ -117,8 +116,8 @@ public class TestNGProvider boolean isTestNGXmlTestSuite( TestRequest testSuiteDefinition ) { - return testSuiteDefinition.getSuiteXmlFiles() != null && testSuiteDefinition.getSuiteXmlFiles().size() > 0 && - testSuiteDefinition.getRequestedTest() == null; + return testSuiteDefinition.getSuiteXmlFiles() != null && testSuiteDefinition.getSuiteXmlFiles().size() > 0 + && testSuiteDefinition.getRequestedTest() == null; } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java index cf3df4b..b4770d6 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java @@ -31,7 +31,6 @@ import org.testng.ISuiteListener; import org.testng.ITestContext; import org.testng.ITestListener; import org.testng.ITestResult; -import org.testng.TestNG; /** * Listens for and provides and adaptor layer so that http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java index 8448a2d..590b699 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.Properties; import org.apache.maven.surefire.report.ConsoleOutputCapture; import org.apache.maven.surefire.report.ConsoleOutputReceiver; -import org.apache.maven.surefire.report.ReporterException; import org.apache.maven.surefire.report.ReporterFactory; import org.apache.maven.surefire.report.RunListener; import org.apache.maven.surefire.testset.TestSetFailedException; @@ -52,13 +51,14 @@ public class TestNGXmlTestSuite private final File reportsDirectory; // Not really used - private Map<File,String> testSets; + private Map<File, String> testSets; /** * Creates a testng testset to be configured by the specified * xml file(s). The XML files are suite definitions files according to TestNG DTD. */ - public TestNGXmlTestSuite( List<File> suiteFiles, String testSourceDirectory, Properties confOptions, File reportsDirectory ) + public TestNGXmlTestSuite( List<File> suiteFiles, String testSourceDirectory, Properties confOptions, + File reportsDirectory ) { this.suiteFiles = suiteFiles; @@ -70,7 +70,7 @@ public class TestNGXmlTestSuite } public void execute( ReporterFactory reporterManagerFactory ) - throws ReporterException, TestSetFailedException + throws TestSetFailedException { if ( testSets == null ) { @@ -105,7 +105,7 @@ public class TestNGXmlTestSuite throw new IllegalStateException( "No suite files were specified" ); } - this.testSets = new HashMap<File,String>(); + this.testSets = new HashMap<File, String>(); this.suiteFilePaths = new ArrayList<String>(); for ( Object suiteFile : suiteFiles ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java index 12491bb..a1d8e0f 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java @@ -20,7 +20,6 @@ package org.apache.maven.surefire.testng; */ import java.util.Map; -import org.apache.maven.surefire.report.ReporterException; import org.apache.maven.surefire.report.ReporterFactory; import org.apache.maven.surefire.testset.TestSetFailedException; @@ -33,7 +32,7 @@ public interface TestNgTestSuite { void execute( String testSetName, ReporterFactory reporterManagerFactory ) - throws ReporterException, TestSetFailedException; + throws TestSetFailedException; Map locateTestSets( ClassLoader classLoader ) throws TestSetFailedException; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java index b344d3d..1c77c83 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java @@ -31,6 +31,10 @@ import org.apache.maven.surefire.testset.TestSetFailedException; import org.testng.TestNG; import org.testng.xml.XmlSuite; +/** + * Configurator that relies on reflection to set parameters in TestNG + * + */ public abstract class AbstractDirectConfigurator implements Configurator { @@ -143,6 +147,10 @@ public abstract class AbstractDirectConfigurator } } + /** + * Describes a property setter by method name and parameter class + * + */ public static final class Setter { private final String setterName; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java index 3019d3d..ddad3d9 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java @@ -25,6 +25,10 @@ import org.apache.maven.surefire.testset.TestSetFailedException; import org.testng.TestNG; import org.testng.xml.XmlSuite; +/** + * Configurator for passing configuration properties to TestNG + * + */ public interface Configurator { void configure( TestNG testng, Map options ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java index fc06989..004004f 100755 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java @@ -61,7 +61,8 @@ public class TestNGMapConfigurator suite.setThreadCount( threadCount ); String parallel = (String) options.get( ProviderParameterNames.PARALLEL_PROP ); - if ( parallel != null ) { + if ( parallel != null ) + { suite.setParallel( parallel ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java ---------------------------------------------------------------------- diff --git a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java index db6beae..6c05ef6 100644 --- a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java +++ b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java @@ -43,7 +43,8 @@ public class SurefireReportParser { private static final String INCLUDES = "*.xml"; - private static final String EXCLUDES = "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml, failsafe-summary*.xml"; + private static final String EXCLUDES = + "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml, failsafe-summary*.xml"; private NumberFormat numberFormat = NumberFormat.getInstance(); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java ---------------------------------------------------------------------- diff --git a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java index 72afd44..7723245 100644 --- a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java +++ b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java @@ -126,7 +126,8 @@ public class TestSuiteXmlParser { if ( "testsuite".equals( qName ) ) { - currentSuite = defaultSuite = new ReportTestSuite(); + defaultSuite = new ReportTestSuite(); + currentSuite = defaultSuite; try { @@ -176,7 +177,8 @@ public class TestSuiteXmlParser currentSuite.setFullClassName( fullClassName ); suites.add( currentSuite ); classesToSuitesIndex.put( fullClassName, suites.size() - 1 ); - } else + } + else { currentSuite = suites.get( currentSuiteIndex ); }
