svn commit: r1292935 - in /ant/core/trunk/src/tests/junit/org/apache/tools/ant: taskdefs/ManifestTest.java util/ReaderInputStreamTest.java

[jglick]

Author: jglick
Date: Thu Feb 23 20:12:57 2012
New Revision: 1292935

URL: http://svn.apache.org/viewvc?rev=1292935&view=rev
Log:
Some tests which failed when run with CWD not equal to ${basedir}.

Modified:
    
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
    
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java

Modified: 
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java?rev=1292935&r1=1292934&r2=1292935&view=diff
==============================================================================
--- 
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java 
(original)
+++ 
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java 
Thu Feb 23 20:12:57 2012
@@ -224,7 +224,7 @@ public class ManifestTest extends BuildF
         value = mainSection.getAttributeValue(NOT_LONG_NAME);
         assertEquals("NOT_LONG_NAME_VALUE_MISMATCH", VALUE, value);
         
-        BufferedReader in = new BufferedReader(new 
FileReader(EXPANDED_MANIFEST));
+        BufferedReader in = new BufferedReader(new FileReader(new 
File(System.getProperty("root"), EXPANDED_MANIFEST)));
         
         Set set = new HashSet();
         String read = in.readLine();

Modified: 
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java?rev=1292935&r1=1292934&r2=1292935&view=diff
==============================================================================
--- 
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java
 (original)
+++ 
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java
 Thu Feb 23 20:12:57 2012
@@ -79,7 +79,7 @@ public class ReaderInputStreamTest exten
         ReaderInputStream r = null;
         FileInputStream utf8 = null;
         try {
-            fin = new InputStreamReader(new 
FileInputStream("src/tests/antunit/taskdefs/exec/input/iso8859-1"),
+            fin = new InputStreamReader(new FileInputStream(new 
File(System.getProperty("root"), 
"src/tests/antunit/taskdefs/exec/input/iso8859-1")),
                                         "ISO8859_1");
             r = new ReaderInputStream(fin, "UTF8");
 
@@ -90,7 +90,7 @@ public class ReaderInputStreamTest exten
                 b = r.read();
             }
 
-            utf8 = new 
FileInputStream("src/tests/antunit/taskdefs/exec/expected/utf-8");
+            utf8 = new FileInputStream(new File(System.getProperty("root"), 
"src/tests/antunit/taskdefs/exec/expected/utf-8"));
             ByteArrayOutputStream expectedOS = new ByteArrayOutputStream();
             b = utf8.read();
             while (b > -1) {