Our XML serializer permits \0, resulting in malformed documents.

This failing test demonstrates the problem. It also adds AllTests
plumbing for this test and some missing ones.

4 files changed, 111 insertions, 1 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
new file mode 100644
index 0000000..f7fac7c
--- /dev/null
+++ b/xml/src/test/java/org/apache/harmony/xml/AllTests.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.harmony.xml;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+    public static Test suite() {
+        TestSuite suite = tests.TestSuiteFactory.createTestSuite();
+        suite.addTestSuite(ExpatParserTest.class);
+        return suite;
+    }
+
+}
diff --git a/xml/src/test/java/org/kxml2/io/AllTests.java b/xml/src/test/java/org/kxml2/io/AllTests.java
new file mode 100644
index 0000000..f996d25
--- /dev/null
+++ b/xml/src/test/java/org/kxml2/io/AllTests.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.kxml2.io;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+    public static Test suite() {
+        TestSuite suite = tests.TestSuiteFactory.createTestSuite();
+        suite.addTestSuite(KXmlSerializerTest.class);
+        return suite;
+    }
+
+}
diff --git a/xml/src/test/java/org/kxml2/io/KXmlSerializerTest.java b/xml/src/test/java/org/kxml2/io/KXmlSerializerTest.java
new file mode 100644
index 0000000..2d5ddf7
--- /dev/null
+++ b/xml/src/test/java/org/kxml2/io/KXmlSerializerTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.kxml2.io;
+
+import junit.framework.TestCase;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class KXmlSerializerTest extends TestCase {
+
+    /** the namespace */
+    final String ns = null;
+
+    public void testEmittingNullCharacterThrows() throws IOException {
+        ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+        KXmlSerializer serializer = new KXmlSerializer();
+        serializer.setOutput(bytesOut, "UTF-8");
+        serializer.startDocument("UTF-8", null);
+
+        serializer.startTag(ns, "foo");
+        try {
+            serializer.text("bar\0baz");
+            fail();
+        } catch (IllegalArgumentException expected) {
+        }
+
+        serializer.startTag(ns, "bar");
+        try {
+            serializer.attribute(ns, "baz", "qu\0ux");
+        } catch (IllegalArgumentException expected) {
+        }
+    }
+}
diff --git a/xml/src/test/java/tests/xml/AllTests.java b/xml/src/test/java/tests/xml/AllTests.java
index 8c089e3..45ca18e 100644
--- a/xml/src/test/java/tests/xml/AllTests.java
+++ b/xml/src/test/java/tests/xml/AllTests.java
@@ -32,7 +32,11 @@ 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());
+        suite.addTest(tests.org.w3c.dom.AllTests.suite());
+        suite.addTest(org.apache.harmony.xml.AllTests.suite());
+        suite.addTest(org.kxml2.io.AllTests.suite());
+
         return suite;
     }