Author: bodewig
Date: Fri May 2 16:53:14 2014
New Revision: 1591972
URL: http://svn.apache.org/r1591972
Log:
PR 56470 - add line breaks between the captured log messages
Modified:
ant/antlibs/antunit/trunk/changes.xml
ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/LogCapturer.java
Modified: ant/antlibs/antunit/trunk/changes.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/changes.xml?rev=1591972&r1=1591971&r2=1591972&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/changes.xml (original)
+++ ant/antlibs/antunit/trunk/changes.xml Fri May 2 16:53:14 2014
@@ -51,6 +51,13 @@
forward any log output from the project under test to the
project running the AntUnit task immediately.
</action>
+ <action type="fix" breaks-bwc="true" issue="56470">
+ LogCapturer now adds (platform dependent) line breaks between
+ log messages that it records.
+ This may break existing assertions on the log if they depended
+ on the absence of line breaks. It also affects the contents of
+ the logcontents resource.
+ </action>
</release>
<release version="1.2" date="2011-08-16">
Modified:
ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/LogCapturer.java
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/LogCapturer.java?rev=1591972&r1=1591971&r2=1591972&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/LogCapturer.java
(original)
+++ ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/LogCapturer.java
Fri May 2 16:53:14 2014
@@ -23,6 +23,7 @@ package org.apache.ant.antunit;
import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildListener;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.StringUtils;
/**
* Captures log messages generated during an antunit task run and
@@ -119,19 +120,19 @@ public class LogCapturer implements Buil
*/
public void messageLogged(BuildEvent event) {
if (event.getPriority() <= Project.MSG_ERR) {
- err.append(event.getMessage());
+ err.append(event.getMessage()).append(StringUtils.LINE_SEP);
}
if (event.getPriority() <= Project.MSG_WARN) {
- warn.append(event.getMessage());
+ warn.append(event.getMessage()).append(StringUtils.LINE_SEP);
}
if (event.getPriority() <= Project.MSG_INFO) {
- info.append(event.getMessage());
+ info.append(event.getMessage()).append(StringUtils.LINE_SEP);
}
if (event.getPriority() <= Project.MSG_VERBOSE) {
- verbose.append(event.getMessage());
+ verbose.append(event.getMessage()).append(StringUtils.LINE_SEP);
}
if (event.getPriority() <= Project.MSG_DEBUG) {
- debug.append(event.getMessage());
+ debug.append(event.getMessage()).append(StringUtils.LINE_SEP);
}
}
-}
\ No newline at end of file
+}
