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 2013/05/29 18:21:20 UTC
git commit: [SUREFIRE-998] Incorrect esacping of umlaut
Updated Branches:
refs/heads/master ce62b9a2c -> d98f734a3
[SUREFIRE-998] Incorrect esacping of umlaut
Fixed with unit test
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d98f734a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d98f734a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d98f734a
Branch: refs/heads/master
Commit: d98f734a37f0a14a0a794f0ac9a9317845525376
Parents: ce62b9a
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Wed May 29 18:18:05 2013 +0200
Committer: Kristian Rosenvold <kr...@apache.org>
Committed: Wed May 29 18:20:35 2013 +0200
----------------------------------------------------------------------
.../surefire/report/StatelessXmlReporter.java | 4 ++--
.../surefire/report/StatelessXMLReporterTest.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d98f734a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index b1ced5e..51308e9 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -427,12 +427,12 @@ public class StatelessXmlReporter
private static boolean isIllegalEscape( char c )
{
- return c < 32 && c != '\n' && c != '\r' && c != '\t';
+ return c >= 0 && c < 32 && c != '\n' && c != '\r' && c != '\t';
}
private static boolean isIllegalEscape( int c )
{
- return c < 32 && c != '\n' && c != '\r' && c != '\t';
+ return c >= 0 && c < 32 && c != '\n' && c != '\r' && c != '\t';
}
private static String escapeXml( String text, boolean attribute )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d98f734a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXMLReporterTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXMLReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXMLReporterTest.java
index 3aa62fc..026be95 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXMLReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXMLReporterTest.java
@@ -87,9 +87,9 @@ public class StatelessXMLReporterTest
stats.testSucceeded( testSetReportEntry );
StackTraceWriter stackTraceWriter = new DeserializedStacktraceWriter( "A fud msg", "trimmed", "fail at foo" );
DeferredFileOutputStream s = new DeferredFileOutputStream( 1000000, "fds", "fdx", new File( "" ) );
- s.write( "std-out<null>!".getBytes() );
+ s.write( "std-o\u00DCt<null>!".getBytes() );
DeferredFileOutputStream s1 = new DeferredFileOutputStream( 1000000, "fds", "fdx", new File( "" ) );
- s1.write( "std-err?&-&£".getBytes() );
+ s1.write( "std-\u0115rr?&-&£".getBytes() );
WrappedReportEntry t2 =
new WrappedReportEntry( new SimpleReportEntry( Inner.class.getName(), testName2, stackTraceWriter, 13 ),
ReportEntryType.error, 13, s, s1 );
@@ -120,8 +120,8 @@ public class StatelessXMLReporterTest
assertNotNull( errorNode );
assertEquals( "A fud msg", errorNode.getAttribute( "message" ) );
assertEquals( "fail at foo", errorNode.getAttribute( "type" ) );
- assertEquals( "std-out<null>!", tcb.getChild( "system-out" ).getValue() );
- assertEquals( "std-err?&-&£", tcb.getChild( "system-err" ).getValue() );
+ assertEquals( "std-o\u00DCt<null>!", tcb.getChild( "system-out" ).getValue() );
+ assertEquals( "std-\u0115rr?&-&£", tcb.getChild( "system-err" ).getValue() );
expectedReportFile.delete();
}