svn commit: r1126700 - in /maven/surefire/trunk: maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java

[krosenvold]

Author: krosenvold
Date: Mon May 23 20:02:00 2011
New Revision: 1126700

URL: http://svn.apache.org/viewvc?rev=1126700&view=rev
Log:
[SUREFIRE-742] Found another very marginal possible error source

Modified:
    
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
    
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java

Modified: 
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java?rev=1126700&r1=1126699&r2=1126700&view=diff
==============================================================================
--- 
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
 (original)
+++ 
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
 Mon May 23 20:02:00 2011
@@ -24,6 +24,8 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.util.List;
 import java.util.Properties;
+import java.util.StringTokenizer;
+
 import org.apache.maven.plugin.surefire.booterclient.output.ForkClient;
 import org.apache.maven.surefire.booter.ForkingRunListener;
 import org.apache.maven.surefire.report.CategorizedReportEntry;
@@ -108,6 +110,17 @@ public class ForkingRunListenerTest
         standardTestRun.assertExpected( MockReporter.TEST_STARTING, expected );
     }
 
+    public void testStringTokenizer(){
+        String test ="5,11,com.abc.TestClass,testMethod,null,22,,,";
+        StringTokenizer tok = new StringTokenizer( test, "," );
+        assertEquals( "5", tok.nextToken());
+        assertEquals( "11", tok.nextToken());
+        assertEquals( "com.abc.TestClass", tok.nextToken());
+        assertEquals( "testMethod", tok.nextToken());
+        assertEquals( "null", tok.nextToken());
+        assertEquals( "22", tok.nextToken());
+        assertFalse(  tok.hasMoreTokens() );
+    }
     public void testSucceded()
         throws ReporterException, IOException
     {

Modified: 
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java?rev=1126700&r1=1126699&r2=1126700&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
 (original)
+++ 
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
 Mon May 23 20:02:00 2011
@@ -250,7 +250,6 @@ public class ForkingRunListener
         nullableEncoding( stringBuffer, reportEntry.getGroup() );
         comma( stringBuffer );
         nullableEncoding( stringBuffer, reportEntry.getElapsed() );
-        comma( stringBuffer );
         encode( stringBuffer, reportEntry.getStackTraceWriter() );
         stringBuffer.append( "\n" );
         return stringBuffer.toString();
@@ -293,7 +292,7 @@ public class ForkingRunListener
 
     private void nullableEncoding( StringBuffer stringBuffer, String source )
     {
-        if ( source == null )
+        if ( source == null || source.length() == 0)
         {
             stringBuffer.append( "null" );
         }
@@ -307,6 +306,7 @@ public class ForkingRunListener
     {
         if ( stackTraceWriter != null )
         {
+            comma( stringBuffer );
             //noinspection ThrowableResultOfMethodCallIgnored
             final Throwable throwable = stackTraceWriter.getThrowable();
             if ( throwable != null )
@@ -320,9 +320,5 @@ public class ForkingRunListener
                 ? stackTraceWriter.writeTrimmedTraceToString()
                 : stackTraceWriter.writeTraceToString() );
         }
-        else
-        {
-            comma( stringBuffer );
-        }
     }
 }