Author: lindner
Date: Thu Jul 1 22:48:42 2010
New Revision: 959803
URL: http://svn.apache.org/viewvc?rev=959803&view=rev
Log:
SHINDIG-1354 | Patch from Jan Luehe | DefaultHtmlSerializer#serialize drops
trailing comments
Added:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java?rev=959803&r1=959802&r2=959803&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
Thu Jul 1 22:48:42 2010
@@ -66,7 +66,10 @@ public class DefaultHtmlSerializer imple
break;
}
case Node.DOCUMENT_NODE: {
- serialize(((Document)n).getDocumentElement(), output, xmlMode);
+ NodeList children = ((Document)n).getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ serialize(children.item(i), output, xmlMode);
+ }
break;
}
case Node.ELEMENT_NODE: {
Added:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java?rev=959803&view=auto
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java
(added)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java
Thu Jul 1 22:48:42 2010
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.shindig.gadgets.parse;
+
+import org.junit.Test;
+import org.w3c.dom.Document;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import static org.junit.Assert.assertEquals;
+
+public class DefaultHtmlSerializerTest {
+
+ @Test
+ public void testComments() throws Exception {
+ Document doc =
DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ doc.appendChild(doc.createElement("ABC"));
+ doc.appendChild(doc.createComment("XYZ"));
+
+ DefaultHtmlSerializer serializer = new DefaultHtmlSerializer();
+ assertEquals("Comment is preserved", "<ABC></ABC><!--XYZ-->",
serializer.serialize(doc));
+ }
+}
+
