Author: krosenvold
Date: Mon Dec 5 19:15:17 2011
New Revision: 1210583
URL: http://svn.apache.org/viewvc?rev=1210583&view=rev
Log:
o Extracted ProviderParameterNames to contain names of providers
Added:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java
- copied, changed from r1210559,
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1210583&r1=1210582&r2=1210583&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
Mon Dec 5 19:15:17 2011
@@ -54,6 +54,7 @@ import org.apache.maven.surefire.booter.
import org.apache.maven.surefire.booter.Classpath;
import org.apache.maven.surefire.booter.ClasspathConfiguration;
import org.apache.maven.surefire.booter.ProviderConfiguration;
+import org.apache.maven.surefire.booter.ProviderParameterNames;
import org.apache.maven.surefire.booter.StartupConfiguration;
import org.apache.maven.surefire.booter.StartupReportConfiguration;
import org.apache.maven.surefire.booter.SurefireBooterForkException;
@@ -253,13 +254,13 @@ public abstract class AbstractSurefireMo
if ( this.getParallel() != null )
{
- getProperties().setProperty( "parallel", this.getParallel() );
+ getProperties().setProperty( ProviderParameterNames.PARALLEL_PROP,
this.getParallel() );
}
convertGroupParameters();
if ( this.getThreadCount() > 0 )
{
- getProperties().setProperty( "threadcount", Integer.toString(
this.getThreadCount() ) );
+ getProperties().setProperty(
ProviderParameterNames.THREADCOUNT_PROP, Integer.toString(
this.getThreadCount() ) );
}
if ( this.getObjectFactory() != null )
{
@@ -281,11 +282,11 @@ public abstract class AbstractSurefireMo
}
if ( this.getExcludedGroups() != null )
{
- getProperties().setProperty( "excludedgroups",
this.getExcludedGroups() );
+ getProperties().setProperty(
ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP, this.getExcludedGroups() );
}
if ( this.getGroups() != null )
{
- getProperties().setProperty( "groups", this.getGroups() );
+ getProperties().setProperty(
ProviderParameterNames.TESTNG_GROUPS_PROP, this.getGroups() );
}
}
@@ -312,11 +313,11 @@ public abstract class AbstractSurefireMo
if ( this.getParallel() != null )
{
- getProperties().setProperty( "parallel", this.getParallel() );
+ getProperties().setProperty( ProviderParameterNames.PARALLEL_PROP,
this.getParallel() );
}
if ( this.getThreadCount() > 0 )
{
- getProperties().setProperty( "threadCount", Integer.toString(
this.getThreadCount() ) );
+ getProperties().setProperty(
ProviderParameterNames.THREADCOUNT_PROP, Integer.toString(
this.getThreadCount() ) );
}
getProperties().setProperty( "perCoreThreadCount", Boolean.toString(
getPerCoreThreadCount() ) );
getProperties().setProperty( "useUnlimitedThreads", Boolean.toString(
getUseUnlimitedThreads() ) );
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java?rev=1210583&r1=1210582&r2=1210583&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
Mon Dec 5 19:15:17 2011
@@ -83,7 +83,7 @@ public class BaseProviderFactory
private int getThreadCount()
{
- final String threadcount = (String) providerProperties.get(
"threadcount" );
+ final String threadcount = (String) providerProperties.get(
ProviderParameterNames.THREADCOUNT_PROP );
return threadcount == null ? 1 : Integer.parseInt( threadcount );
}
Copied:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java
(from r1210559,
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java?p2=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java&p1=maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java&r1=1210559&r2=1210583&rev=1210583&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java
Mon Dec 5 19:15:17 2011
@@ -1,5 +1,4 @@
-package org.apache.maven.surefire.testng.conf;
-
+package org.apache.maven.surefire.booter;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,23 +19,13 @@ package org.apache.maven.surefire.testng
*/
/**
- * TestNG 5.2 configurator.
- * <p/>
- * Allowed options:
- * -groups
- * -excludedgroups
- * -junit (boolean)
- * -threadcount (int)
- * -parallel (String)
- * <p/>
- *
- * @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a>
+ * @author Kristian Rosenvold
*/
-public class TestNG52Configurator
- extends AbstractDirectConfigurator
+public class ProviderParameterNames
{
- public TestNG52Configurator()
- {
- setters.put( "parallel", new Setter( "setParallel", String.class ) );
- }
-}
\ No newline at end of file
+ public static final String TESTNG_EXCLUDEDGROUPS_PROP = "excludegroups";
+ public static final String TESTNG_GROUPS_PROP = "groups";
+ public static final String THREADCOUNT_PROP = "threadcount";
+ public static final String PARALLEL_PROP = "parallel";
+
+}
Modified:
maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java?rev=1210583&r1=1210582&r2=1210583&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
(original)
+++
maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
Mon Dec 5 19:15:17 2011
@@ -22,6 +22,7 @@ package org.apache.maven.surefire.common
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import org.apache.maven.surefire.booter.ProviderParameterNames;
import org.codehaus.plexus.util.SelectorUtils;
import org.junit.experimental.categories.Categories;
@@ -42,8 +43,8 @@ public class FilterFactory
public Filter createGroupFilter( Properties providerProperties )
{
- String groups = providerProperties.getProperty( "groups" );
- String excludedGroups = providerProperties.getProperty(
"excludedgroups" );
+ String groups = providerProperties.getProperty(
ProviderParameterNames.TESTNG_GROUPS_PROP );
+ String excludedGroups = providerProperties.getProperty(
ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP );
List<Filter> included = commaSeparatedListToFilters( groups );
List<Filter> excluded = commaSeparatedListToFilters( excludedGroups );
return new CombinedCategoryFilter( included, excluded );
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java?rev=1210583&r1=1210582&r2=1210583&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
Mon Dec 5 19:15:17 2011
@@ -20,6 +20,7 @@ package org.apache.maven.surefire.junitc
*/
import java.util.Properties;
+import org.apache.maven.surefire.booter.ProviderParameterNames;
/**
* @author Kristian Rosenvold
@@ -34,11 +35,11 @@ class JUnitCoreParameters
private final Boolean useUnlimitedThreads;
- public static final String PARALLEL_KEY = "parallel";
+ public static final String PARALLEL_KEY =
ProviderParameterNames.PARALLEL_PROP;
public static final String PERCORETHREADCOUNT_KEY = "perCoreThreadCount";
- public static final String THREADCOUNT_KEY = "threadCount";
+ public static final String THREADCOUNT_KEY =
ProviderParameterNames.THREADCOUNT_PROP;
public static final String USEUNLIMITEDTHREADS_KEY = "useUnlimitedThreads";
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java?rev=1210583&r1=1210582&r2=1210583&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
Mon Dec 5 19:15:17 2011
@@ -25,6 +25,7 @@ import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.maven.plugin.surefire.report.FileReporterFactory;
import org.apache.maven.surefire.booter.BaseProviderFactory;
+import org.apache.maven.surefire.booter.ProviderParameterNames;
import org.apache.maven.surefire.report.ConsoleLogger;
import org.apache.maven.surefire.report.DefaultConsoleReporter;
import org.apache.maven.surefire.report.ReporterConfiguration;
@@ -83,7 +84,7 @@ public class Surefire746Test {
providerParameters.setReporterConfiguration(new
ReporterConfiguration(new File(""), false));
Properties junitProps = new Properties();
- junitProps.put("parallel", "none");
+ junitProps.put( ProviderParameterNames.PARALLEL_PROP, "none");
JUnitCoreParameters jUnitCoreParameters = new
JUnitCoreParameters(junitProps);
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java?rev=1210583&r1=1210582&r2=1210583&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
Mon Dec 5 19:15:17 2011
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.maven.surefire.booter.ProviderParameterNames;
import org.apache.maven.surefire.testset.TestSetFailedException;
import org.apache.maven.surefire.util.NestedRuntimeException;
import org.testng.TestNG;
@@ -38,10 +39,10 @@ public abstract class AbstractDirectConf
AbstractDirectConfigurator()
{
Map options = new HashMap();
- options.put( "groups", new Setter( "setGroups", String.class ) );
- options.put( "excludedgroups", new Setter( "setExcludedGroups",
String.class ) );
+ options.put( ProviderParameterNames.TESTNG_GROUPS_PROP, new Setter(
"setGroups", String.class ) );
+ options.put( ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP, new
Setter( "setExcludedGroups", String.class ) );
options.put( "junit", new Setter( "setJUnit", Boolean.class ) );
- options.put( "threadcount", new Setter( "setThreadCount", int.class )
);
+ options.put( ProviderParameterNames.THREADCOUNT_PROP, new Setter(
"setThreadCount", int.class ) );
options.put( "usedefaultlisteners", new Setter(
"setUseDefaultListeners", boolean.class ) );
this.setters = options;
}
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java?rev=1210583&r1=1210582&r2=1210583&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java
Mon Dec 5 19:15:17 2011
@@ -19,6 +19,8 @@ package org.apache.maven.surefire.testng
* under the License.
*/
+import org.apache.maven.surefire.booter.ProviderParameterNames;
+
/**
* TestNG 4.7 and 5.1 configurator.
* <p/>
@@ -37,6 +39,6 @@ public class TestNG4751Configurator
{
public TestNG4751Configurator()
{
- setters.put( "parallel", new Setter( "setParallel", boolean.class ) );
+ setters.put( ProviderParameterNames.PARALLEL_PROP, new Setter(
"setParallel", boolean.class ) );
}
}
\ No newline at end of file
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java?rev=1210583&r1=1210582&r2=1210583&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
Mon Dec 5 19:15:17 2011
@@ -19,6 +19,8 @@ package org.apache.maven.surefire.testng
* under the License.
*/
+import org.apache.maven.surefire.booter.ProviderParameterNames;
+
/**
* TestNG 5.2 configurator.
* <p/>
@@ -37,6 +39,6 @@ public class TestNG52Configurator
{
public TestNG52Configurator()
{
- setters.put( "parallel", new Setter( "setParallel", String.class ) );
+ setters.put( ProviderParameterNames.PARALLEL_PROP, new Setter(
"setParallel", String.class ) );
}
}
\ No newline at end of file
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java?rev=1210583&r1=1210582&r2=1210583&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
Mon Dec 5 19:15:17 2011
@@ -19,14 +19,15 @@ package org.apache.maven.surefire.testng
* under the License.
*/
-import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.testng.TestNG;
-
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.apache.maven.surefire.booter.ProviderParameterNames;
+import org.apache.maven.surefire.testset.TestSetFailedException;
+
+import org.testng.TestNG;
/**
* TestNG configurator for 5.3+ versions. TestNG exposes
@@ -77,7 +78,7 @@ public class TestNGMapConfigurator
{
val = convert( val, Boolean.class );
}
- else if ( "threadcount".equals( key ) )
+ else if ( ProviderParameterNames.THREADCOUNT_PROP.equals( key ) )
{
val = convert( val, String.class );
}
