You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2015/05/11 01:43:38 UTC
maven-surefire git commit: [SUREFIRE] REFACTORING
Repository: maven-surefire
Updated Branches:
refs/heads/master c14b25fe5 -> 198f56266
[SUREFIRE] REFACTORING
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/198f5626
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/198f5626
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/198f5626
Branch: refs/heads/master
Commit: 198f56266bf54c85f66381cde1621e15a9b66b55
Parents: c14b25f
Author: Tibor17 <ti...@lycos.com>
Authored: Mon May 11 01:42:52 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Mon May 11 01:42:52 2015 +0200
----------------------------------------------------------------------
.../plugin/surefire/report/ConsoleReporter.java | 28 +++++---------------
.../surefire/report/SmartStackTraceParser.java | 4 +--
.../maven/surefire/junitcore/TestMethod.java | 1 -
3 files changed, 7 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/198f5626/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
index 605fbfb..d0849bf 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
@@ -58,22 +58,14 @@ public class ConsoleReporter
public void writeMessage( String message )
{
- if ( writer != null )
- {
- writer.print( message );
-
- writer.flush();
- }
+ writer.print( message );
+ writer.flush();
}
public void writeLnMessage( String message )
{
- if ( writer != null )
- {
- writer.println( message );
-
- writer.flush();
- }
+ writer.println( message );
+ writer.flush();
}
public void testSetCompleted( WrappedReportEntry report, TestSetStats testSetStats, List<String> testResults )
@@ -92,10 +84,7 @@ public class ConsoleReporter
public void reset()
{
- if ( writer != null )
- {
- writer.flush();
- }
+ writer.flush();
}
/**
@@ -107,12 +96,7 @@ public class ConsoleReporter
*/
static String getTestSetStartingMessage( ReportEntry report )
{
- StringBuilder message = new StringBuilder();
- message.append( TEST_SET_STARTING_PREFIX );
- message.append( report.getNameWithGroup() );
-
- message.append( "\n" );
- return message.toString();
+ return TEST_SET_STARTING_PREFIX + report.getNameWithGroup() + "\n";
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/198f5626/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index c0f1128..056eef3 100644
--- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -92,7 +92,6 @@ public class SmartStackTraceParser
StringBuilder result = new StringBuilder();
List<StackTraceElement> stackTraceElements = focusOnClass( stackTrace, testClass );
Collections.reverse( stackTraceElements );
- StackTraceElement stackTraceElement;
if ( stackTraceElements.isEmpty() )
{
result.append( simpleName );
@@ -105,7 +104,7 @@ public class SmartStackTraceParser
{
for ( int i = 0; i < stackTraceElements.size(); i++ )
{
- stackTraceElement = stackTraceElements.get( i );
+ final StackTraceElement stackTraceElement = stackTraceElements.get( i );
if ( i == 0 )
{
result.append( simpleName );
@@ -117,7 +116,6 @@ public class SmartStackTraceParser
{
result.append( "." );
}
-
}
if ( !stackTraceElement.getClassName().equals( testClassName ) )
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/198f5626/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
index 5b9e8ac..a448dfb 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
@@ -142,7 +142,6 @@ class TestMethod
{
TEST_METHOD.set( this );
ConsoleOutputReceiverForCurrentThread.set( this );
-
}
void detachFromCurrentThread()