You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/08/20 19:02:21 UTC
svn commit: r1375109 - in
/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore:
ClassDemarcatingRunner.java ConcurrentReporterManager.java
Author: krosenvold
Date: Mon Aug 20 17:02:21 2012
New Revision: 1375109
URL: http://svn.apache.org/viewvc?rev=1375109&view=rev
Log:
o Removed last remains of CDR
Removed:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassDemarcatingRunner.java
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java?rev=1375109&r1=1375108&r2=1375109&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java Mon Aug 20 17:02:21 2012
@@ -151,12 +151,7 @@ public abstract class ConcurrentReporter
TestSet getTestSet( ReportEntry description )
{
- TestSet testSet = classMethodCounts.get( description.getSourceName() );
- if ( testSet == null )
- {
- testSet = classMethodCounts.get( ClassDemarcatingRunner.getCurrentTestClass() );
- }
- return testSet;
+ return classMethodCounts.get( description.getSourceName() );
}
RunListener getRunListener()
@@ -195,17 +190,8 @@ public abstract class ConcurrentReporter
}
else
{
- String currentTestClassName = ClassDemarcatingRunner.getCurrentTestClass();
- TestSet testSet = currentTestClassName != null ? classMethodCounts.get( currentTestClassName ) : null;
- if ( testSet != null )
- {
- testSet.getClassLevelLogicalStream().write( stdout, buf, off, len );
- }
- else
- {
- // Not able to assocaite output with any thread. Just dump to console
- consoleLogger.info( new String( buf, off, len ) );
- }
+ // Not able to assocaite output with any thread. Just dump to console
+ consoleLogger.info( new String( buf, off, len ) );
}
}