From ab38cf75040bb173b35d68c879c2401b20489413 Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Thu, 21 Apr 2011 16:18:32 +0000
Subject: [PATCH] tweaking tests affecting by having made flush a no-op in
 fixing bug 50507

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1095768 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/java.xml                       | 8 ++++----
 .../tools/ant/util/LineOrientedOutputStreamTest.java      | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/etc/testcases/taskdefs/java.xml b/src/etc/testcases/taskdefs/java.xml
index 2a7fe3c74..6e2e1ccb0 100644
--- a/src/etc/testcases/taskdefs/java.xml
+++ b/src/etc/testcases/taskdefs/java.xml
@@ -208,11 +208,11 @@
         <loadfile property="redirect.out.contents" srcfile="${outfile}" />
 
         <condition property="r1file">
-            <equals arg1="${redirect.out.contents}" arg2="foo" />
+            <equals arg1="${redirect.out.contents}" arg2="foo${line.separator}" />
         </condition>
 
         <fail unless="r1file">${outfile}:
-&quot;${redirect.out.contents}&quot; expected &quot;foo&quot;</fail>
+&quot;${redirect.out.contents}&quot; expected &quot;foo&#010;&quot;</fail>
 
         <condition property="r1prop">
             <equals arg1="${redirect.err}" arg2="" />
@@ -248,11 +248,11 @@ redirect.err=&quot;${redirect.err}&quot; should be empty</fail>
         <loadfile property="redirect.out.contents2" srcfile="${outfile}" />
 
         <condition property="r2file">
-            <equals arg1="${redirect.out.contents2}" arg2="foobar" />
+            <equals arg1="${redirect.out.contents2}" arg2="foo${line.separator}bar${line.separator}" />
         </condition>
 
         <fail unless="r2file">${outfile}:
-&quot;${redirect.out.contents2}&quot; expected &quot;foobar&quot;</fail>
+&quot;${redirect.out.contents2}&quot; expected &quot;foo&#010;bar&#010;&quot;</fail>
 
         <condition property="r2prop">
             <!-- property should not change -->
diff --git a/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java b/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java
index 2283acd7d..b4fad70ea 100644
--- a/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java
@@ -84,13 +84,13 @@ public class LineOrientedOutputStreamTest extends TestCase {
     public void testFlushArray() throws IOException {
         writeByteArray();
         stream.flush();
-        stream.assertInvoked();
+        stream.assertNotInvoked();
     }
 
     public void testFlushSingleBytes() throws IOException {
         writeSingleBytes();
         stream.flush();
-        stream.assertInvoked();
+        stream.assertNotInvoked();
     }
 
     public void testCloseArray() throws IOException {
@@ -133,5 +133,8 @@ public class LineOrientedOutputStreamTest extends TestCase {
         private void assertInvoked() {
             assertTrue("At least one line", invoked);
         }
+        private void assertNotInvoked() {
+            assertTrue("No output", invoked==false);
+        }
     }
 }// LineOrientedOutputStreamTest