Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1364 d303e625e -> dc092b415 (forced update)


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/FirstTest.java
----------------------------------------------------------------------
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/FirstTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/FirstTest.java
new file mode 100644
index 0000000..f2a9e66
--- /dev/null
+++ 
b/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/FirstTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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 org.junit.Test;
+
+public class FirstTest extends TestCase
+{
+    @Test
+    public void test() throws InterruptedException
+    {
+        Thread.sleep( 100 );
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/SecondTest.java
----------------------------------------------------------------------
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/SecondTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/SecondTest.java
new file mode 100644
index 0000000..cfd9b51
--- /dev/null
+++ 
b/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/SecondTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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 org.junit.Test;
+
+public class SecondTest extends TestCase
+{
+    @Test
+    public void test() throws InterruptedException
+    {
+        Thread.sleep( 100 );
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/ThirdTest.java
----------------------------------------------------------------------
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/ThirdTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/ThirdTest.java
new file mode 100644
index 0000000..f3633d6
--- /dev/null
+++ 
b/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/ThirdTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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 org.testng.annotations.Test;
+
+
+public class ThirdTest
+{
+    @Test
+    public void test() throws InterruptedException
+    {
+        Thread.sleep( 100 );
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java
----------------------------------------------------------------------
diff --git 
a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java
 
b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java
index 12cbb4c..9f3b6ff 100644
--- 
a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java
+++ 
b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.maven.surefire.report.ReportEntry;
 import org.apache.maven.surefire.report.RunListener;
+import org.apache.maven.surefire.report.TestSetReportEntry;
 
 /**
  * Internal tests use only.
@@ -56,13 +57,13 @@ public class MockReporter
     }
 
     @Override
-    public void testSetStarting( ReportEntry report )
+    public void testSetStarting( TestSetReportEntry report )
     {
         events.add( SET_STARTED );
     }
 
     @Override
-    public void testSetCompleted( ReportEntry report )
+    public void testSetCompleted( TestSetReportEntry report )
     {
         events.add( SET_COMPLETED );
     }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/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 adfda35..b8c83e1 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
@@ -25,7 +25,6 @@ import org.apache.maven.surefire.providerapi.AbstractProvider;
 import org.apache.maven.surefire.providerapi.ProviderParameters;
 import org.apache.maven.surefire.report.ConsoleOutputCapture;
 import org.apache.maven.surefire.report.ConsoleOutputReceiver;
-import org.apache.maven.surefire.report.ReportEntry;
 import org.apache.maven.surefire.report.ReporterFactory;
 import org.apache.maven.surefire.report.RunListener;
 import org.apache.maven.surefire.report.SimpleReportEntry;
@@ -36,6 +35,10 @@ import org.apache.maven.surefire.util.RunOrderCalculator;
 import org.apache.maven.surefire.util.ScanResult;
 import org.apache.maven.surefire.util.TestsToRun;
 
+import java.util.Map;
+
+import static org.apache.maven.surefire.util.internal.ObjectUtils.systemProps;
+
 /**
  * @author Kristian Rosenvold
  */
@@ -95,8 +98,8 @@ public class JUnit3Provider
         {
             final RunListener reporter = reporterFactory.createReporter();
             ConsoleOutputCapture.startCapture( (ConsoleOutputReceiver) 
reporter );
-
-            final String smClassName = System.getProperty( 
"surefire.security.manager" );
+            final Map<String, String> systemProperties = systemProps();
+            final String smClassName = systemProperties.get( 
"surefire.security.manager" );
             if ( smClassName != null )
             {
                 SecurityManager securityManager =
@@ -107,7 +110,7 @@ public class JUnit3Provider
             for ( Class<?> clazz : testsToRun )
             {
                 SurefireTestSet surefireTestSet = createTestSet( clazz );
-                executeTestSet( surefireTestSet, reporter, testClassLoader );
+                executeTestSet( surefireTestSet, reporter, testClassLoader, 
systemProperties );
             }
 
         }
@@ -126,10 +129,11 @@ public class JUnit3Provider
             : new PojoTestSet( clazz );
     }
 
-    private void executeTestSet( SurefireTestSet testSet, RunListener 
reporter, ClassLoader classLoader )
+    private void executeTestSet( SurefireTestSet testSet, RunListener 
reporter, ClassLoader classLoader,
+                                 Map<String, String> systemProperties )
         throws TestSetFailedException
     {
-        ReportEntry report = new SimpleReportEntry( this.getClass().getName(), 
testSet.getName() );
+        SimpleReportEntry report = new SimpleReportEntry( 
getClass().getName(), testSet.getName(), systemProperties );
 
         reporter.testSetStarting( report );
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
----------------------------------------------------------------------
diff --git 
a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
 
b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
index 359a79f..9c08fd9 100644
--- 
a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
+++ 
b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
@@ -19,16 +19,17 @@ package org.apache.maven.surefire.junit;
  * under the License.
  */
 
-import java.util.ArrayList;
-import java.util.List;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 import org.apache.maven.surefire.common.junit3.JUnit3Reflector;
 import org.apache.maven.surefire.report.ReportEntry;
 import org.apache.maven.surefire.report.RunListener;
+import org.apache.maven.surefire.report.TestSetReportEntry;
 import org.apache.maven.surefire.testset.TestSetFailedException;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import java.util.ArrayList;
+import java.util.List;
 
 public class JUnitTestSetTest
     extends TestCase
@@ -64,12 +65,12 @@ public class JUnitTestSetTest
         private List<ReportEntry> succeededTests = new 
ArrayList<ReportEntry>();
 
         @Override
-        public void testSetStarting( ReportEntry report )
+        public void testSetStarting( TestSetReportEntry report )
         {
         }
 
         @Override
-        public void testSetCompleted( ReportEntry report )
+        public void testSetCompleted( TestSetReportEntry report )
         {
         }
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
----------------------------------------------------------------------
diff --git 
a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
 
b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
index 12842fa..ad29224 100644
--- 
a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
+++ 
b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
@@ -31,7 +31,6 @@ import org.apache.maven.surefire.providerapi.AbstractProvider;
 import org.apache.maven.surefire.providerapi.ProviderParameters;
 import org.apache.maven.surefire.report.ConsoleOutputReceiver;
 import org.apache.maven.surefire.report.PojoStackTraceWriter;
-import org.apache.maven.surefire.report.ReportEntry;
 import org.apache.maven.surefire.report.ReporterFactory;
 import org.apache.maven.surefire.report.RunListener;
 import org.apache.maven.surefire.report.SimpleReportEntry;
@@ -66,6 +65,7 @@ import static 
org.apache.maven.surefire.report.ConsoleOutputCapture.startCapture
 import static org.apache.maven.surefire.report.SimpleReportEntry.withException;
 import static 
org.apache.maven.surefire.testset.TestListResolver.optionallyWildcardFilter;
 import static org.apache.maven.surefire.util.TestsToRun.fromClass;
+import static org.apache.maven.surefire.util.internal.ObjectUtils.systemProps;
 import static org.junit.runner.Request.aClass;
 import static org.junit.runner.Request.method;
 
@@ -232,7 +232,7 @@ public class JUnit4Provider
 
     private void executeTestSet( Class<?> clazz, RunListener reporter, 
Notifier notifier )
     {
-        final ReportEntry report = new SimpleReportEntry( 
getClass().getName(), clazz.getName() );
+        final SimpleReportEntry report = new SimpleReportEntry( 
getClass().getName(), clazz.getName(), systemProps() );
         reporter.testSetStarting( report );
         try
         {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java
----------------------------------------------------------------------
diff --git 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java
 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java
index e8ac786..52a7ffb 100644
--- 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java
+++ 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java
@@ -40,7 +40,7 @@ public class ClassesParallelRunListener
     }
 
     @Override
-    public void checkIfTestSetCanBeReported( TestSet testSetForTest )
+    protected void checkIfTestSetCanBeReported( TestSet testSetForTest )
     {
         TestSet currentlyAttached = TestSet.getThreadTestSet();
         if ( currentlyAttached != null && currentlyAttached != testSetForTest )

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
----------------------------------------------------------------------
diff --git 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
index 8095dbf..6af12dc 100644
--- 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
+++ 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
@@ -26,6 +26,7 @@ import org.apache.maven.surefire.report.ReportEntry;
 import org.apache.maven.surefire.report.ReporterFactory;
 import org.apache.maven.surefire.report.RunListener;
 import org.apache.maven.surefire.report.StackTraceWriter;
+import org.apache.maven.surefire.report.TestSetReportEntry;
 import org.apache.maven.surefire.testset.TestSetFailedException;
 
 import static 
org.apache.maven.surefire.junitcore.TestMethod.getThreadTestMethod;
@@ -70,12 +71,12 @@ public abstract class ConcurrentRunListener
     }
 
     @Override
-    public void testSetStarting( ReportEntry description )
+    public void testSetStarting( TestSetReportEntry description )
     {
     }
 
     @Override
-    public void testSetCompleted( ReportEntry result )
+    public void testSetCompleted( TestSetReportEntry result )
     {
         final RunListener reporterManager = getRunListener();
         for ( TestSet testSet : classMethodCounts.values() )

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java
----------------------------------------------------------------------
diff --git 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java
 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java
index 0e487b0..b478670 100644
--- 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java
+++ 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java
@@ -44,7 +44,7 @@ public class MethodsParallelRunListener
     }
 
     @Override
-    public void checkIfTestSetCanBeReported( TestSet testSetForTest )
+    protected void checkIfTestSetCanBeReported( TestSet testSetForTest )
     {
         synchronized ( lock )
         {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
----------------------------------------------------------------------
diff --git 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
index 0e5ee77..e9897bd 100644
--- 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
+++ 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
@@ -23,11 +23,17 @@ import 
org.apache.maven.surefire.common.junit4.JUnit4RunListener;
 import org.apache.maven.surefire.report.ConsoleOutputReceiver;
 import org.apache.maven.surefire.report.RunListener;
 import org.apache.maven.surefire.report.SimpleReportEntry;
+import org.apache.maven.surefire.report.TestSetReportEntry;
 import org.apache.maven.surefire.testset.TestSetFailedException;
 import org.junit.runner.Description;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
 
+import java.util.Collections;
+import java.util.Map;
+
+import static org.apache.maven.surefire.util.internal.ObjectUtils.systemProps;
+
 /**
  * A class to be used when there is no JUnit parallelism (methods or/and 
class). This allow to workaround JUnit
  * limitation a la Junit4 provider. Specifically, we can redirect properly the 
output even if we don't have class
@@ -60,10 +66,20 @@ public class NonConcurrentRunListener
         return new SimpleReportEntry( extractDescriptionClassName( description 
), description.getDisplayName() );
     }
 
-    protected SimpleReportEntry createReportEntryForTestSet( Description 
description )
+    private TestSetReportEntry createReportEntryForTestSet( Description 
description, Map<String, String> systemProps )
     {
         String testClassName = extractDescriptionClassName( description );
-        return new SimpleReportEntry( testClassName, testClassName );
+        return new SimpleReportEntry( testClassName, testClassName, 
systemProps );
+    }
+
+    private TestSetReportEntry createTestSetReportEntryStarted( Description 
description )
+    {
+        return createReportEntryForTestSet( description, Collections.<String, 
String>emptyMap() );
+    }
+
+    private TestSetReportEntry createTestSetReportEntryFinished( Description 
description )
+    {
+        return createReportEntryForTestSet( description, systemProps() );
     }
 
     @Override
@@ -93,10 +109,11 @@ public class NonConcurrentRunListener
             currentTestSetDescription = description;
             if ( lastFinishedDescription != null )
             {
-                reporter.testSetCompleted( createReportEntryForTestSet( 
lastFinishedDescription ) );
+                TestSetReportEntry reportEntry = 
createTestSetReportEntryFinished( lastFinishedDescription );
+                reporter.testSetCompleted( reportEntry );
                 lastFinishedDescription = null;
             }
-            reporter.testSetStarting( createReportEntryForTestSet( description 
) );
+            reporter.testSetStarting( createTestSetReportEntryStarted( 
description ) );
         }
     }
 
@@ -166,7 +183,7 @@ public class NonConcurrentRunListener
     {
         if ( lastFinishedDescription != null )
         {
-            reporter.testSetCompleted( createReportEntryForTestSet( 
lastFinishedDescription ) );
+            reporter.testSetCompleted( createTestSetReportEntryFinished( 
lastFinishedDescription ) );
             lastFinishedDescription = null;
         }
     }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
----------------------------------------------------------------------
diff --git 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
index d7bb722..0f05327 100644
--- 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
+++ 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
@@ -19,17 +19,21 @@ package org.apache.maven.surefire.junitcore;
  * under the License.
  */
 
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.RunListener;
+import org.apache.maven.surefire.report.SimpleReportEntry;
+import org.apache.maven.surefire.report.TestSetReportEntry;
+import org.junit.runner.Description;
+
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.RunListener;
-import org.apache.maven.surefire.report.SimpleReportEntry;
-
-import org.junit.runner.Description;
+import static org.apache.maven.surefire.util.internal.ObjectUtils.systemProps;
 
 /**
  * * Represents the test-state of a testset that is run.
@@ -64,7 +68,7 @@ public class TestSet
         {
             try
             {
-                ReportEntry report = createReportEntry( null );
+                TestSetReportEntry report = createReportEntryStarted();
 
                 target.testSetStarting( report );
 
@@ -87,7 +91,7 @@ public class TestSet
 
                 int elapsed = (int) ( endTime - startTile );
 
-                report = createReportEntry( elapsed );
+                report = createReportEntryCompleted( elapsed );
 
                 target.testSetCompleted( report );
             }
@@ -106,7 +110,17 @@ public class TestSet
         return testMethod;
     }
 
-    private ReportEntry createReportEntry( Integer elapsed )
+    private TestSetReportEntry createReportEntryStarted()
+    {
+        return createReportEntry( null, Collections.<String, String>emptyMap() 
);
+    }
+
+    private TestSetReportEntry createReportEntryCompleted( int elapsed )
+    {
+        return createReportEntry( elapsed, systemProps() );
+    }
+
+    private TestSetReportEntry createReportEntry( Integer elapsed, Map<String, 
String> systemProps )
     {
         final String className = testSetDescription.getClassName();
         final boolean isJunit3 = className == null;
@@ -120,7 +134,7 @@ public class TestSet
         {
             classNameToUse = className;
         }
-        return new SimpleReportEntry( classNameToUse, classNameToUse, elapsed 
);
+        return new SimpleReportEntry( classNameToUse, classNameToUse, null, 
elapsed, systemProps );
     }
 
     public void incrementTestMethodCount()

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc092b41/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestSuite.java
----------------------------------------------------------------------
diff --git 
a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestSuite.java
 
b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestSuite.java
index a74ef0d..ca40f7c 100644
--- 
a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestSuite.java
+++ 
b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestSuite.java
@@ -19,13 +19,15 @@ package org.apache.maven.surefire.testng;
  * under the License.
  */
 
-import org.apache.maven.surefire.report.ReportEntry;
 import org.apache.maven.surefire.report.ReporterException;
 import org.apache.maven.surefire.report.RunListener;
 import org.apache.maven.surefire.report.SimpleReportEntry;
+import org.apache.maven.surefire.report.TestSetReportEntry;
 
 import java.util.Map;
 
+import static org.apache.maven.surefire.util.internal.ObjectUtils.systemProps;
+
 /**
  * Abstract class which implements common functions.
  */
@@ -41,7 +43,7 @@ abstract class TestSuite
 
     final void startTestSuite( RunListener reporterManager )
     {
-        ReportEntry report = new SimpleReportEntry( getClass().getName(), 
getSuiteName() );
+        TestSetReportEntry report = new SimpleReportEntry( 
getClass().getName(), getSuiteName(), systemProps() );
 
         try
         {
@@ -55,7 +57,7 @@ abstract class TestSuite
 
     final void finishTestSuite( RunListener reporterManager )
     {
-        ReportEntry report = new SimpleReportEntry( getClass().getName(), 
getSuiteName() );
+        SimpleReportEntry report = new SimpleReportEntry( 
getClass().getName(), getSuiteName(), systemProps() );
         reporterManager.testSetCompleted( report );
     }
 }

Reply via email to