diff options
Diffstat (limited to 'xml/src')
20 files changed, 16 insertions, 71 deletions
diff --git a/xml/src/main/java/javax/xml/package.html b/xml/src/main/java/javax/xml/package.html index 5a4621d..f3d8318 100644 --- a/xml/src/main/java/javax/xml/package.html +++ b/xml/src/main/java/javax/xml/package.html @@ -3,6 +3,5 @@ <p> Provides a utility class with useful XML constants. </p> - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/xml/src/main/java/org/w3c/dom/package.html b/xml/src/main/java/org/w3c/dom/package.html index 8189944..15f8ff6 100644 --- a/xml/src/main/java/org/w3c/dom/package.html +++ b/xml/src/main/java/org/w3c/dom/package.html @@ -6,7 +6,5 @@ {@link javax.xml.parsers.DocumentBuilder} are accessed and manipulated through these interfaces. </p> - - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/xml/src/main/java/org/xml/sax/ext/package.html b/xml/src/main/java/org/xml/sax/ext/package.html index 9b79d77..e443df4 100644 --- a/xml/src/main/java/org/xml/sax/ext/package.html +++ b/xml/src/main/java/org/xml/sax/ext/package.html @@ -43,6 +43,4 @@ be recognized directly by parsers, however. As an example, most validation systems can be cleanly layered on top of parsers supporting the standardized SAX2 interfaces. </p> -@since Android 1.0 - </BODY></HTML> diff --git a/xml/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java b/xml/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java index 96151a1..b761c34 100644 --- a/xml/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java +++ b/xml/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java @@ -124,10 +124,7 @@ final public class XMLReaderFactory in = loader.getResourceAsStream (service); if (in != null) { - // BEGIN android-modified - reader = new BufferedReader ( - new InputStreamReader (in, "UTF8"), 8192); - // END android-modified + reader = new BufferedReader (new InputStreamReader (in, "UTF8")); className = reader.readLine (); in.close (); } diff --git a/xml/src/main/java/org/xml/sax/helpers/package.html b/xml/src/main/java/org/xml/sax/helpers/package.html index 3a265fd..8f323c0 100644 --- a/xml/src/main/java/org/xml/sax/helpers/package.html +++ b/xml/src/main/java/org/xml/sax/helpers/package.html @@ -8,6 +8,4 @@ support for bootstrapping SAX-based applications. <p>See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> for more information about SAX.</p> -@since Android 1.0 - </BODY></HTML> diff --git a/xml/src/main/java/org/xml/sax/package.html b/xml/src/main/java/org/xml/sax/package.html index fbe7108..7d7f257 100644 --- a/xml/src/main/java/org/xml/sax/package.html +++ b/xml/src/main/java/org/xml/sax/package.html @@ -294,6 +294,4 @@ the standard property URIs have the prefix XMLReader implementations need not support them. </p> -@since Android 1.0 - -</body></html>
\ No newline at end of file +</body></html> diff --git a/xml/src/test/java/org/apache/harmony/xml/AllTests.java b/xml/src/test/java/org/apache/harmony/xml/AllTests.java index f7fac7c..c04c1b5 100644 --- a/xml/src/test/java/org/apache/harmony/xml/AllTests.java +++ b/xml/src/test/java/org/apache/harmony/xml/AllTests.java @@ -21,7 +21,7 @@ import junit.framework.TestSuite; public class AllTests { public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite(); + TestSuite suite = new TestSuite(); suite.addTestSuite(ExpatParserTest.class); return suite; } diff --git a/xml/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java b/xml/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java index e752fc0..0c24fac 100644 --- a/xml/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java +++ b/xml/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java @@ -20,7 +20,6 @@ import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import junit.textui.TestRunner; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -57,16 +56,6 @@ public class JaxenXPathTestSuite { private static final File DEFAULT_JAXEN_HOME = new File("/home/dalvik-prebuild/jaxen"); - public static void main(String[] args) throws Exception { - if (args.length != 1) { - System.out.println("Usage: JaxenXPathTestSuite <jaxen-home>"); - return; - } - - File jaxenHome = new File(args[0]); - TestRunner.run(suite(jaxenHome)); - } - public static Test suite() throws Exception { return suite(DEFAULT_JAXEN_HOME); } diff --git a/xml/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java b/xml/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java index 7dbfaea..3f0d2cb 100644 --- a/xml/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java +++ b/xml/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java @@ -21,7 +21,6 @@ import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import junit.textui.TestRunner; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -135,7 +134,7 @@ public class XsltXPathConformanceTestSuite { } File catalogXml = new File(args[0]); - TestRunner.run(suite(catalogXml)); + // TestRunner.run(suite(catalogXml)); android-changed } public static Test suite() throws Exception { diff --git a/xml/src/test/java/org/kxml2/io/AllTests.java b/xml/src/test/java/org/kxml2/io/AllTests.java index f996d25..4fcc44a 100644 --- a/xml/src/test/java/org/kxml2/io/AllTests.java +++ b/xml/src/test/java/org/kxml2/io/AllTests.java @@ -21,7 +21,7 @@ import junit.framework.TestSuite; public class AllTests { public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite(); + TestSuite suite = new TestSuite(); suite.addTestSuite(KXmlSerializerTest.class); return suite; } diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/AllTests.java b/xml/src/test/java/tests/api/javax/xml/parsers/AllTests.java index 6a22109..aecc746 100644 --- a/xml/src/test/java/tests/api/javax/xml/parsers/AllTests.java +++ b/xml/src/test/java/tests/api/javax/xml/parsers/AllTests.java @@ -25,13 +25,8 @@ import org.apache.harmony.xml.ExpatParserTest; */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package tests.api.javax.xml.parsers;"); + TestSuite suite = new TestSuite("All tests for package tests.api.javax.xml.parsers;"); // $JUnit-BEGIN$ suite.addTestSuite(DocumentBuilderFactoryTest.class); diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java b/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java index 80c6e3c..7356d3a 100644 --- a/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java +++ b/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java @@ -319,7 +319,6 @@ public class DocumentBuilderFactoryTest extends TestCase { args = {boolean.class} ) }) - @KnownFailure("Should handle XIncludeAware flag more gracefully") public void test_isSetXIncludeAware() { dbf.setXIncludeAware(true); assertTrue(dbf.isXIncludeAware()); diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java b/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java index 4b4511d..2818460 100644 --- a/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java +++ b/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java @@ -252,7 +252,6 @@ public class DocumentBuilderTest extends TestCase { method = "isXIncludeAware", args = {} ) - @KnownFailure("Should handle XIncludeAware flag more gracefully") public void testIsXIncludeAware() { try { dbf.setXIncludeAware(false); @@ -607,7 +606,6 @@ public class DocumentBuilderTest extends TestCase { method = "reset", args = { } ) - @KnownFailure("Android DocumentBuilder should implement reset() properly") public void testReset() { // Make sure EntityResolver gets reset InputStream source = new ByteArrayInputStream("<a>&foo;</a>".getBytes()); @@ -694,7 +692,6 @@ public class DocumentBuilderTest extends TestCase { method = "setEntityResolver", args = { EntityResolver.class } ) - @KnownFailure("Android DocumentBuilder should support entity resolving") public void testSetEntityResolver() { // Ordinary case InputStream source = new ByteArrayInputStream("<a>&foo;</a>".getBytes()); diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java b/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java index 6f050e3..d5bf289 100644 --- a/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java +++ b/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java @@ -163,7 +163,6 @@ public class SAXParserFactoryTest extends TestCase { args = {boolean.class} ) }) - @KnownFailure("Should handle XIncludeAware flag more gracefully") public void test_setIsXIncludeAware() { spf.setXIncludeAware(true); assertTrue(spf.isXIncludeAware()); diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java b/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java index ad0b9c2..a80c4e3 100644 --- a/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java +++ b/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java @@ -327,7 +327,6 @@ public class SAXParserTest extends TestCase { method = "isXIncludeAware", args = {} ) - @KnownFailure("Should handle XIncludeAware flag more gracefully") public void testIsXIncludeAware() { try { spf.setXIncludeAware(false); @@ -1047,7 +1046,6 @@ public class SAXParserTest extends TestCase { method = "reset", args = { } ) - @KnownFailure("Android DocumentBuilder should implement reset() properly") public void testReset() { try { spf = SAXParserFactory.newInstance(); @@ -1103,7 +1101,6 @@ public class SAXParserTest extends TestCase { args = { String.class, Object.class } ) }) - @KnownFailure("ExpatParser should allow to clear properties") public void testSetGetProperty() { // Ordinary case String validName = "http://xml.org/sax/properties/lexical-handler"; diff --git a/xml/src/test/java/tests/api/org/xml/sax/AllTests.java b/xml/src/test/java/tests/api/org/xml/sax/AllTests.java index 9c29178..f7643e9 100644 --- a/xml/src/test/java/tests/api/org/xml/sax/AllTests.java +++ b/xml/src/test/java/tests/api/org/xml/sax/AllTests.java @@ -20,13 +20,8 @@ import junit.framework.Test; import junit.framework.TestSuite; public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("Tests for org.xml.sax package"); + TestSuite suite = new TestSuite("Tests for org.xml.sax package"); // $JUnit-BEGIN$ suite.addTestSuite(HandlerBaseTest.class); diff --git a/xml/src/test/java/tests/api/org/xml/sax/ext/AllTests.java b/xml/src/test/java/tests/api/org/xml/sax/ext/AllTests.java index f4b34b8..1334780 100644 --- a/xml/src/test/java/tests/api/org/xml/sax/ext/AllTests.java +++ b/xml/src/test/java/tests/api/org/xml/sax/ext/AllTests.java @@ -20,13 +20,8 @@ import junit.framework.Test; import junit.framework.TestSuite; public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("Tests for org.xml.sax.ext package"); + TestSuite suite = new TestSuite("Tests for org.xml.sax.ext package"); // $JUnit-BEGIN$ suite.addTestSuite(Attributes2ImplTest.class); diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/AllTests.java b/xml/src/test/java/tests/api/org/xml/sax/helpers/AllTests.java index 5bf63bf..135496c 100644 --- a/xml/src/test/java/tests/api/org/xml/sax/helpers/AllTests.java +++ b/xml/src/test/java/tests/api/org/xml/sax/helpers/AllTests.java @@ -20,13 +20,8 @@ import junit.framework.Test; import junit.framework.TestSuite; public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("Tests for org.xml.sax.helpers package"); + TestSuite suite = new TestSuite("Tests for org.xml.sax.helpers package"); // $JUnit-BEGIN$ suite.addTestSuite(AttributeListImplTest.class); diff --git a/xml/src/test/java/tests/org/w3c/dom/AllTests.java b/xml/src/test/java/tests/org/w3c/dom/AllTests.java index a4299a7..5dba844 100644 --- a/xml/src/test/java/tests/org/w3c/dom/AllTests.java +++ b/xml/src/test/java/tests/org/w3c/dom/AllTests.java @@ -24,13 +24,8 @@ import junit.framework.TestSuite; */ public class AllTests { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTests.suite()); - } - public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite("All tests for package org.w3c.dom;"); + TestSuite suite = new TestSuite("All tests for package org.w3c.dom;"); // $JUnit-BEGIN$ suite.addTestSuite(AttrGetOwnerElement.class); diff --git a/xml/src/test/java/tests/xml/AllTests.java b/xml/src/test/java/tests/xml/AllTests.java index e9f833f..2e12a59 100644 --- a/xml/src/test/java/tests/xml/AllTests.java +++ b/xml/src/test/java/tests/xml/AllTests.java @@ -22,7 +22,7 @@ import junit.framework.TestSuite; public class AllTests { public static Test suite() { - TestSuite suite = tests.TestSuiteFactory.createTestSuite(); + TestSuite suite = new TestSuite(); suite.addTestSuite(DeclarationTest.class); suite.addTestSuite(DomTest.class); @@ -36,7 +36,9 @@ public class AllTests { suite.addTest(tests.api.javax.xml.parsers.AllTests.suite()); suite.addTest(tests.api.org.xml.sax.AllTests.suite()); - suite.addTest(tests.api.org.w3c.dom.AllTests.suite()); + // BEGIN android-changed: this is in the dom module! + // suite.addTest(tests.api.org.w3c.dom.AllTests.suite()); + // END android-changed suite.addTest(tests.org.w3c.dom.AllTests.suite()); suite.addTest(org.apache.harmony.xml.AllTests.suite()); suite.addTest(org.kxml2.io.AllTests.suite()); |