diff options
Diffstat (limited to 'xml/src')
13 files changed, 12 insertions, 45 deletions
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/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 6b10a0d..cfa62dc 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 @@ -251,7 +251,6 @@ public class DocumentBuilderTest extends TestCase { method = "isXIncludeAware", args = {} ) - @KnownFailure("Should handle XIncludeAware flag more gracefully") public void testIsXIncludeAware() { try { dbf.setXIncludeAware(false); @@ -620,7 +619,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()); @@ -707,7 +705,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 a918ac2..b573dbd 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()); @@ -316,7 +315,6 @@ public class SAXParserFactoryTest extends TestCase { method = "setNamespaceAware", args = {boolean.class} ) - @KnownFailure("Error in namespace feature handling (for ExpatParser)") public void test_setNamespaceAwareZ() { spf.setNamespaceAware(true); 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 ca7cf71..b7e3f74 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 89da364..0042967 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(SimpleParserTest.class); suite.addTestSuite(SimpleBuilderTest.class); @@ -32,7 +32,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()); |