maven-surefire git commit: [SUREFIRE-1305] surefire fails on parallel tests when newline character is in test description [Forced Update!]

[tibordigana]

Repository: maven-surefire
Updated Branches:
  refs/heads/master ce6264f2d -> d7bf6ce49 (forced update)


[SUREFIRE-1305] surefire fails on parallel tests when newline character is in 
test description


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

Branch: refs/heads/master
Commit: d7bf6ce49043a3301494fdd26c538afad4e1938d
Parents: 569e754
Author: Tibor17 
Authored: Sat Dec 3 22:26:42 2016 +0100
Committer: Tibor17 
Committed: Sat Dec 3 22:26:42 2016 +0100

--
 .../util/internal/TestClassMethodNameUtils.java |  1 +
 .../common/junit4/JUnit4RunListener.java| 25 
 .../common/junit4/JUnit4StackTraceWriter.java   |  8 +++
 3 files changed, 9 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d7bf6ce4/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java
--
diff --git 
a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java
 
b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java
new file mode 100644
index 000..29b4f51
--- /dev/null
+++ 
b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java
@@ -0,0 +1 @@
+package org.apache.maven.surefire.util.internal;

/*
 * 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 java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
 * JUnit Description parser.
 * Used by JUnit Version lower than 4.
 7.
 *
 * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17)
 * @since 2.19.2
 */
public final class TestClassMethodNameUtils
{
private static final Pattern METHOD_CLASS_PATTERN = Pattern.compile( 
"([\\s\\S]*)\\((.*)\\)" );

private TestClassMethodNameUtils()
{
throw new IllegalStateException( "no instantiable constructor" );
}

public static String extractClassName( String displayName )
{
Matcher m = METHOD_CLASS_PATTERN.matcher( displayName );
return m.matches() ? m.group( 2 ) : displayName;
}

public static String extractMethodName( String displayName )
{
int i = displayName.indexOf( "(" );
return i >= 0 ? displayName.substring( 0, i ) : displayName;
}
}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d7bf6ce4/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
--
diff --git 
a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
 
b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
index dd004fa..1d365cf 100644
--- 
a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
+++ 
b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
@@ -28,14 +28,13 @@ import org.junit.runner.Description;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import static 
org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.isFailureInsideJUnitItself;
 import static 
org.apache.maven.surefire.common.junit4.JUnit4Reflector.getAnnotatedIgnoreValue;
 import static org.apache.maven.surefire.report.SimpleReportEntry.assumption;
 import static org.apache.maven.surefire.report.SimpleReportEntry.ignored;
 import static org.apache.maven.surefire.report.SimpleReportEntry.withException;
+import static 

maven-surefire git commit: [SUREFIRE-1305] surefire fails on parallel tests when newline character is in test description

[tibordigana]

Repository: maven-surefire
Updated Branches:
  refs/heads/master 195e4833c -> c2a7d4b7f


[SUREFIRE-1305] surefire fails on parallel tests when newline character is in 
test description


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

Branch: refs/heads/master
Commit: c2a7d4b7f28b0fb5456b9871fd87cbac5c70cbd3
Parents: 195e483
Author: Tibor17 
Authored: Fri Dec 2 02:51:07 2016 +0100
Committer: Tibor17 
Committed: Fri Dec 2 02:51:07 2016 +0100

--
 .../maven/surefire/common/junit4/JUnit4RunListener.java   | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c2a7d4b7/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
--
diff --git 
a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
 
b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
index d3aa9a4..85e2acd 100644
--- 
a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
+++ 
b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
@@ -44,11 +44,7 @@ import static 
org.apache.maven.surefire.report.SimpleReportEntry.withException;
 public class JUnit4RunListener
 extends org.junit.runner.notification.RunListener
 {
-private static final Pattern PARENS = Pattern.compile( "^" + ".+" //any 
character
-   + "\\(("
-   // then an 
open-paren (start matching a group)
-   + 
"[^()]+" //non-parens
-   + ")\\)" + "$" 
);
+private static final Pattern METHOD_CLASS_PATTERN = Pattern.compile( 
"([\\s\\S]*)\\((.*)\\)" );
 
 protected final RunListener reporter;
 
@@ -188,8 +184,8 @@ public class JUnit4RunListener
 public static String extractClassName( Description description )
 {
 String displayName = description.getDisplayName();
-Matcher m = PARENS.matcher( displayName );
-return m.find() ? m.group( 1 ) : displayName;
+Matcher m = METHOD_CLASS_PATTERN.matcher( displayName );
+return m.matches() ? m.group( 2 ) : displayName;
 }
 
 public static String extractMethodName( Description description )