Author: krosenvold
Date: Tue May 17 17:48:33 2011
New Revision: 1104433
URL: http://svn.apache.org/viewvc?rev=1104433&view=rev
Log:
o Fixed problem when printing null.
Piggybacked onto SUREFIRE-704 by S Daigle. Thanks for the report.
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/src/test/java/junit/surefire733/ATest.java
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java?rev=1104433&r1=1104432&r2=1104433&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
Tue May 17 17:48:33 2011
@@ -19,11 +19,10 @@ package org.apache.maven.surefire.report
* under the License.
*/
-import org.apache.maven.surefire.util.internal.ByteBuffer;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
+import org.apache.maven.surefire.util.internal.ByteBuffer;
/**
* Deals with system.out/err.
@@ -81,6 +80,9 @@ public class ConsoleOutputCapture
public void println( String s )
{
+ if (s == null){
+ s = "null"; // Shamelessy taken from super.print
+ }
final byte[] bytes = s.getBytes();
final byte[] join = ByteBuffer.join( bytes, 0, bytes.length,
newline, 0, 1 );
target.writeTestOutput( join, 0, join.length, isStdout );
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml?rev=1104433&r1=1104432&r2=1104433&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
Tue May 17 17:48:33 2011
@@ -32,7 +32,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -45,6 +45,10 @@
<version>${surefire.version}</version>
</plugin>
</plugins>
+
</build>
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ </properties>
</project>
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/src/test/java/junit/surefire733/ATest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/src/test/java/junit/surefire733/ATest.java?rev=1104433&r1=1104432&r2=1104433&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/src/test/java/junit/surefire733/ATest.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/src/test/java/junit/surefire733/ATest.java
Tue May 17 17:48:33 2011
@@ -10,5 +10,17 @@ public class ATest
final byte[] bytes = "bc".getBytes();
System.out.write(bytes, 0, bytes.length);
System.out.write('\n');
+ System.out.println("ABC");
+ System.out.println((String)null);
+
+ final byte[] errbytes = "ef".getBytes();
+ System.err.write( (int) 'z' );
+ System.err.write(errbytes, 0, bytes.length);
+ System.err.write('\n');
+
+
+ System.err.println("XYZ");
+ System.err.println((String)null);
+
}
}
