Merge "Fix a testcase in InputStreamReaderTest."

1 files changed, 4 insertions, 8 deletions

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java
index 080559a..b84561a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java
@@ -405,7 +405,7 @@ public class InputStreamReaderTest extends TestCase {
     public void test_read_specialCharset() throws IOException {
         reader.close();
         in = this.getClass().getClassLoader().getResourceAsStream(
-                "org/apache/harmony/luni/tests/java/io/testfile-utf8.txt");
+                "tests/api/java/io/testfile-utf8.txt");
         reader = new InputStreamReader(in, "utf-8");
         int c;
         StringBuffer sb = new StringBuffer();
@@ -418,13 +418,9 @@ public class InputStreamReaderTest extends TestCase {
         sb.setLength(0);
         reader.close();
         in = this.getClass().getClassLoader().getResourceAsStream(
-                "org/apache/harmony/luni/tests/java/io/testfile.txt");
-        try {
-            reader = new InputStreamReader(in, "gb18030");
-        } catch (UnsupportedEncodingException e) {
-            System.out
-                    .println("GB18030 is not supported, abort test InputStreamReaderTest.testSpecialCharsetReading().");
-        }
+                "tests/api/java/io/testfile.txt");
+
+        reader = new InputStreamReader(in, "gb18030");
         while ((c = reader.read()) != -1) {
             sb.append((char) c);
         }