maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tibordig...@apache.org
Subject [1/7] maven-surefire git commit: Quick fix for SUREFIRE-1177 and SUREFIRE-1179
Date Tue, 29 Sep 2015 22:55:39 GMT
Repository: maven-surefire
Updated Branches:
  refs/heads/master feda08851 -> 3dba8e7bd


Quick fix for SUREFIRE-1177 and SUREFIRE-1179


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f3bbccbe
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f3bbccbe
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f3bbccbe

Branch: refs/heads/master
Commit: f3bbccbe48888cfc7eb2134af4dcc0fcd32edb94
Parents: feda088
Author: Julien Herr <julien.herr@alcatel-lucent.com>
Authored: Fri Sep 18 16:19:10 2015 +0200
Committer: Tibor17 <tibor17@lycos.com>
Committed: Wed Sep 30 00:53:52 2015 +0200

----------------------------------------------------------------------
 .../surefire/testng/conf/TestNGMapConfigurator.java    | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f3bbccbe/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 ff7378d..0d7d625 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
@@ -113,6 +113,14 @@ public class TestNGMapConfigurator
             {
                 val = convert ( val, String.class );
             }
+            else if ( "suitethreadpoolsize".equals( key ) )
+            {
+                val = convert( val, Integer.class );
+            }
+            else if ( "dataproviderthreadcount".equals( key ) )
+            {
+                val = convert( val, Integer.class );
+            }
             // TODO objectfactory... not even documented, does it work?
             if ( key.startsWith( "-" ) )
             {
@@ -161,6 +169,11 @@ public class TestNGMapConfigurator
             return Boolean.valueOf( (String) val );
         }
 
+        if ( ( Integer.class.equals( type ) || int.class.equals( type ) ) && String.class.equals(
val.getClass() ) )
+        {
+            return Integer.valueOf( (String) val );
+        }
+
         if ( String.class.equals( type ) )
         {
             return val.toString();


Mime
View raw message