Index: src/test/api/java.injected/javax/swing/text/html/parser/Utils.java =================================================================== --- src/test/api/java.injected/javax/swing/text/html/parser/Utils.java (revision 477225) +++ src/test/api/java.injected/javax/swing/text/html/parser/Utils.java (working copy) @@ -24,8 +24,8 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; -import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -297,14 +297,11 @@ public static Reader getReader(final String testName) { Reader result = null; - try { - FileInputStream fis = - new FileInputStream(System.getProperty("TEST_SRC_DIR") - + "javax/swing/text/html/parser/" + testName - + ".html"); - result = new InputStreamReader(fis); - } catch (IOException e) { - e.printStackTrace(); + InputStream is = Utils.class + .getResourceAsStream("/javax/swing/text/html/parser/" + + testName + ".html"); + if (is != null) { + result = new InputStreamReader(is); } return result; } @@ -327,12 +324,6 @@ } public static DTD getFilledDTD() { -// if (SwingTestCase.isHarmony()) { -// DTD dtd = new DTD("test"); -// DTDUtilities.initDTD(dtd); -// return dtd; -// } - DTD dtd = getDefaultDTDInstance(); fillDTD(dtd); return dtd; @@ -341,9 +332,10 @@ public static void fillDTD(final DTD dtd) { String name = SwingTestCase.isHarmony() ? "transitional401.bdtd" : "html32.bdtd"; + try { - dtd.read(new DataInputStream(dtd.getClass() - .getResourceAsStream(name))); + dtd.read(new DataInputStream(dtd.getClass().getResourceAsStream( + name))); } catch (IOException e) { e.printStackTrace(); TestCase.assertFalse("Unexpected IOException", true); @@ -366,7 +358,7 @@ //TODO add checking position for atts && pos && public static class ParserCallback extends HTMLEditorKit.ParserCallback { - public final boolean debugOut = true; + public final boolean debugOut = false; public Utils.ExtDocumentParser parserForCheck; @@ -710,7 +702,7 @@ } public static class ExtDocumentParser extends DocumentParser { - public boolean debugOut = true; + public boolean debugOut = false; public int pos_d;