Browse Source

Some tests which failed when run with CWD not equal to ${basedir}.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1292935 13f79535-47bb-0310-9956-ffa450edef68
master
Jesse N. Glick 13 years ago
parent
commit
2d89206b92
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
  2. +2
    -2
      src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java

+ 1
- 1
src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java View File

@@ -224,7 +224,7 @@ public class ManifestTest extends BuildFileTest {
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();


+ 2
- 2
src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java View File

@@ -79,7 +79,7 @@ public class ReaderInputStreamTest extends TestCase {
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 extends TestCase {
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) {


Loading…
Cancel
Save