maven-surefire git commit: [SUREFIRE-1112] Remove uneccessary newlines in console output for test results with no error
Repository: maven-surefire
Updated Branches:
refs/heads/master 53a40eef4 -> 8ce08a7f5
[SUREFIRE-1112] Remove uneccessary newlines in console output for test results
with no error
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/8ce08a7f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/8ce08a7f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/8ce08a7f
Branch: refs/heads/master
Commit: 8ce08a7f552cba06ceec6383b7636b4e77d1e0b9
Parents: 53a40ee
Author: tibordigana
Authored: Fri Nov 7 01:22:27 2014 +0100
Committer: tibordigana
Committed: Fri Nov 7 01:22:27 2014 +0100
--
.../surefire/report/DefaultReporterFactory.java | 89 ++--
.../report/DefaultReporterFactoryTest.java | 8 +-
2 files changed, 49 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8ce08a7f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index dfbec97..35ef7e4 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -56,13 +56,13 @@ public class DefaultReporterFactory
Collections.synchronizedList( new ArrayList() );
// from "." -> statistics about all the runs for
flaky tests
-private Map> flakyTests = null;
+private Map> flakyTests;
// from "." -> statistics about all the runs for
failed tests
-private Map> failedTests = null;
+private Map> failedTests;
// from "." -> statistics about all the runs for
error tests
-private Map> errorTests = null;
+private Map> errorTests;
public DefaultReporterFactory( StartupReportConfiguration
reportConfiguration )
{
@@ -139,9 +139,13 @@ public class DefaultReporterFactory
logger.info( "Results :" );
logger.info( "" );
}
-printTestFailures( logger, TestResultType.failure );
-printTestFailures( logger, TestResultType.error );
-printTestFailures( logger, TestResultType.flake );
+boolean printedFailures = printTestFailures( logger,
TestResultType.failure );
+printedFailures |= printTestFailures( logger, TestResultType.error );
+printedFailures |= printTestFailures( logger, TestResultType.flake );
+if ( printedFailures )
+{
+logger.info( "" );
+}
logger.info( globalStats.getSummary() );
logger.info( "" );
}
@@ -168,7 +172,7 @@ public class DefaultReporterFactory
// Use default visibility for testing
static TestResultType getTestResultType( List
reportEntryList, int rerunFailingTestsCount )
{
-if ( reportEntryList == null || reportEntryList.size() == 0 )
+if ( reportEntryList == null || reportEntryList.isEmpty() )
{
return TestResultType.unknown;
}
@@ -202,13 +206,9 @@ public class DefaultReporterFactory
{
return TestResultType.error;
}
-else if ( seenFailure )
-{
-return TestResultType.failure;
-}
else
{
-return TestResultType.skipped;
+return TestResultType.failure;
}
}
}
@@ -313,61 +313,62 @@ public class DefaultReporterFactory
*
* @param logger the logger used to log information
* @param type the type of results to be printed, could be error,
failure or flake
+ * @return {@code true} if printed some lines
*/
// Use default visibility for testing
-void printTestFailures( DefaultDirectConsoleReporter logger,
TestResultType type )
+boolean printTestFailures( DefaultDirectConsoleReporter logger,
TestResultType type )
{
-Map> testStats;
-if ( type == TestResultType.failure )
+boolean printed = false;
+final Map> testStats;
+switch ( type )
{
-testStats = failedTests;
-}
-else if ( type == TestResultType.error )
-{
-testStats = errorTests;
-}
-else if ( type == TestResultType.flake )
-{
-testStats = flakyTests;
-}
-else
-{
-logger.info( "" );
-
svn commit: r7070 - in /release/maven/plugins: maven-assembly-plugin-2.5.1-source-release.zip maven-assembly-plugin-2.5.1-source-release.zip.asc maven-assembly-plugin-2.5.1-source-release.zip.md5
Author: krosenvold Date: Fri Nov 7 20:21:22 2014 New Revision: 7070 Log: Added 2.5.1 Added: release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip (with props) release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.asc release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.md5 Added: release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.asc == --- release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.asc (added) +++ release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.asc Fri Nov 7 20:21:22 2014 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iF4EABEIAAYFAlRY6lkACgkQRmyu1uB0fVBS+gEAwd8/cuoFrpa6xBeIPOx80+AX +IvnfCw9d9EmwZjkGYjUBAMrUFUYiY8iXq8j66dhwmQIpzGMnJAiP3KaiV45JP5ia +=oXLM +-END PGP SIGNATURE- Added: release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.md5 == --- release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.md5 (added) +++ release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.md5 Fri Nov 7 20:21:22 2014 @@ -0,0 +1 @@ +90caba903bd37cb87e9d69312a8340c3 \ No newline at end of file
svn commit: r7071 - in /release/maven/plugins: maven-assembly-plugin-2.5-source-release.zip maven-assembly-plugin-2.5-source-release.zip.asc maven-assembly-plugin-2.5-source-release.zip.md5
Author: krosenvold Date: Fri Nov 7 20:21:49 2014 New Revision: 7071 Log: Removed 2.5 Removed: release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.asc release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.md5
maven-surefire git commit: [SUREFIRE-1114] NPE in TestSetStats. Concurrency issue with parallel methods on TestNG.
Repository: maven-surefire
Updated Branches:
refs/heads/master 8ce08a7f5 -> dcc84fe8a
[SUREFIRE-1114] NPE in TestSetStats. Concurrency issue with parallel methods on
TestNG.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/dcc84fe8
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/dcc84fe8
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/dcc84fe8
Branch: refs/heads/master
Commit: dcc84fe8a65bf4380e72f765e92a824f7e74f10d
Parents: 8ce08a7
Author: tibordigana
Authored: Fri Nov 7 21:44:57 2014 +0100
Committer: tibordigana
Committed: Fri Nov 7 21:44:57 2014 +0100
--
.../apache/maven/plugin/surefire/report/TestSetStats.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dcc84fe8/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
index 2ff40ba..95e92d4 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
@@ -21,14 +21,19 @@ package org.apache.maven.plugin.surefire.report;
import java.text.NumberFormat;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Locale;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
/**
* Maintains per-thread test result state. Not thread safe.
*/
public class TestSetStats
{
+private final Queue reportEntries = new
ConcurrentLinkedQueue();
+
private final boolean trimStackTrace;
private final boolean plainFormat;
@@ -49,8 +54,6 @@ public class TestSetStats
private long elapsedForTestSet;
-private final List reportEntries = new
ArrayList();
-
public TestSetStats( boolean trimStackTrace, boolean plainFormat )
{
this.trimStackTrace = trimStackTrace;
@@ -242,7 +245,7 @@ public class TestSetStats
return result;
}
-public List getReportEntries()
+public Collection getReportEntries()
{
return reportEntries;
}
maven-surefire git commit: removed unnecessary groupId
Repository: maven-surefire Updated Branches: refs/heads/master dcc84fe8a -> af54b06d7 removed unnecessary groupId Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/af54b06d Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/af54b06d Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/af54b06d Branch: refs/heads/master Commit: af54b06d76125348b16317136069bb160036f18b Parents: dcc84fe Author: tibordigana Authored: Fri Nov 7 21:59:28 2014 +0100 Committer: tibordigana Committed: Fri Nov 7 21:59:28 2014 +0100 -- surefire-setup-integration-tests/pom.xml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/af54b06d/surefire-setup-integration-tests/pom.xml -- diff --git a/surefire-setup-integration-tests/pom.xml b/surefire-setup-integration-tests/pom.xml index 8228962..fb48529 100644 --- a/surefire-setup-integration-tests/pom.xml +++ b/surefire-setup-integration-tests/pom.xml @@ -28,7 +28,6 @@ ../pom.xml - org.apache.maven.surefire surefire-setup-integration-tests Maven Surefire Integration Test Setup
maven-surefire git commit: IT test is missing the version of maven-compiler-plugin
Repository: maven-surefire Updated Branches: refs/heads/master af54b06d7 -> 5e45b6929 IT test is missing the version of maven-compiler-plugin Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/5e45b692 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/5e45b692 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/5e45b692 Branch: refs/heads/master Commit: 5e45b6929f6fd3286f5ccaf89a30473fa36b3b8d Parents: af54b06 Author: tibordigana Authored: Fri Nov 7 22:09:26 2014 +0100 Committer: tibordigana Committed: Fri Nov 7 22:09:26 2014 +0100 -- .../src/test/resources/testng-group-thread-parallel/pom.xml | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e45b692/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml b/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml index 2c22ab3..8ae10d3 100644 --- a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml @@ -23,6 +23,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 + +org.apache.maven.surefire +it-parent +1.0 +../pom.xml + + org.apache.maven.plugins.surefire testng-group-thread-parallel 1.0-SNAPSHOT
maven-surefire git commit: refactor package of IT test EnvironmentVariablesIT in surefire
Repository: maven-surefire
Updated Branches:
refs/heads/master 5e45b6929 -> c97303b78
refactor package of IT test EnvironmentVariablesIT in surefire
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c97303b7
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c97303b7
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c97303b7
Branch: refs/heads/master
Commit: c97303b78a4f685c661c7e35d94ddc6ca7becc37
Parents: 5e45b69
Author: tibordigana
Authored: Fri Nov 7 22:15:56 2014 +0100
Committer: tibordigana
Committed: Fri Nov 7 22:15:56 2014 +0100
--
.../maven/surefire/EnvironmentVariablesIT.java | 47
.../surefire/its/EnvironmentVariablesIT.java| 47
2 files changed, 47 insertions(+), 47 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c97303b7/surefire-integration-tests/src/test/java/org/apache/maven/surefire/EnvironmentVariablesIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/EnvironmentVariablesIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/EnvironmentVariablesIT.java
deleted file mode 100644
index a8a346b..000
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/EnvironmentVariablesIT.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.apache.maven.surefire;
-
-/*
- * 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.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-/**
- * SUREFIRE-763 Asserts that environment variables are correctly populated
using "useSystemClassLoader=false"
- * SUREFIRE-963 Asserts that empty environment variables are read as "".
- *
- * @author Kristian Rosenvold
- * @author Christophe Deneux
- */
-public class EnvironmentVariablesIT
-extends SurefireJUnit4IntegrationTestCase
-{
-@Test
-public void testWhenUseSystemClassLoader()
-{
-unpack( "/environment-variables" ).addGoal(
"-DuseSystemClassLoader=true" ).executeTest();
-}
-
-@Test
-public void testWhenDontUseSystemClassLoader()
-{
-unpack( "/environment-variables" ).addGoal(
"-DuseSystemClassLoader=false" ).executeTest();
-}
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c97303b7/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java
new file mode 100644
index 000..651200f
--- /dev/null
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java
@@ -0,0 +1,47 @@
+package org.apache.maven.surefire.its;
+
+/*
+ * 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.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+/**
+ * SUREFIRE-763 Asserts that
svn commit: r7075 - /release/maven/surefire/
Author: khmarbaise Date: Fri Nov 7 21:52:16 2014 New Revision: 7075 Log: - Apache Maven Surefire 2.18. Added: release/maven/surefire/surefire-2.18-source-release.zip (with props) release/maven/surefire/surefire-2.18-source-release.zip.asc release/maven/surefire/surefire-2.18-source-release.zip.md5 Removed: release/maven/surefire/surefire-2.17-source-release.zip release/maven/surefire/surefire-2.17-source-release.zip.asc release/maven/surefire/surefire-2.17-source-release.zip.md5 Added: release/maven/surefire/surefire-2.18-source-release.zip == Binary file - no diff available. Propchange: release/maven/surefire/surefire-2.18-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/surefire/surefire-2.18-source-release.zip.asc == --- release/maven/surefire/surefire-2.18-source-release.zip.asc (added) +++ release/maven/surefire/surefire-2.18-source-release.zip.asc Fri Nov 7 21:52:16 2014 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.17 (MingW32) + +iF4EABEIAAYFAlRVLtwACgkQpfCU/Tlh3wWy0wD6AmK1Cd0wfXb01CkkMfJovae/ +8D8Xe8LmFtZPnY7/iR4BAKUEaJp3xoonrs7dOLO3WTgpBedZOY2iZQZjSLzhfWr6 +=bviL +-END PGP SIGNATURE- Added: release/maven/surefire/surefire-2.18-source-release.zip.md5 == --- release/maven/surefire/surefire-2.18-source-release.zip.md5 (added) +++ release/maven/surefire/surefire-2.18-source-release.zip.md5 Fri Nov 7 21:52:16 2014 @@ -0,0 +1 @@ +0639c1d87a19630da9aa0a3d1a609ac2 \ No newline at end of file
