StaticDomNodeList has to be serializable (issue #513)

HtmlUnit · Oct 22, 2022 · 906ac9e · 906ac9e
1 parent 73ce413
commit 906ac9e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,9 @@
 
     <body>
         <release version="2.66.0" date="xxxx, 2022" description="Chrome/Edge 106, Firefox 106, Bugfixes, NumberFormat, HTMLMediaElement">
+            <action type="fix" dev="rbri" issue="513">
+                StaticDomNodeList has to be serializable.
+            </action>
             <action type="fix" dev="rbri" issue="513">
                 Lambda functions used by Element have to be serializable.
             </action>

diff --git a/src/main/java/com/gargoylesoftware/htmlunit/html/StaticDomNodeList.java b/src/main/java/com/gargoylesoftware/htmlunit/html/StaticDomNodeList.java
@@ -14,6 +14,7 @@
  */
 package com.gargoylesoftware.htmlunit.html;
 
+import java.io.Serializable;
 import java.util.AbstractList;
 import java.util.List;
 
@@ -23,8 +24,9 @@
  * An implementation of DomNodeList that is static.
  *
  * @author Ahmed Ashour
+ * @author Ronald Brill
  */
-class StaticDomNodeList extends AbstractList<DomNode> implements DomNodeList<DomNode> {
+class StaticDomNodeList extends AbstractList<DomNode> implements DomNodeList<DomNode>, Serializable {
 
     private final List<DomNode> elements_;
 

diff --git a/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java b/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java
@@ -1344,6 +1344,35 @@ public void serializationLambda() throws Exception {
         assertEquals("Hello there!", page2.getHtmlElementById("myId").getFirstChild().getNodeValue());
     }
 
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    public void serializationStaticDomNodeList() throws Exception {
+        final String content =
+              "<html><body>\n"
+            + "<div id='myId'>Hello there!</div>\n"
+            + "<form name='f' id='f'></form>\n"
+            + "<script>var y = document.querySelectorAll('*');</script>\n"
+            + "</body></html>";
+
+        final HtmlPage page1 = loadPage(content);
+        final byte[] bytes = SerializationUtils.serialize(page1);
+
+        final HtmlPage page2 = (HtmlPage) SerializationUtils.deserialize(bytes);
+
+        final Iterator<HtmlElement> iterator1 = page1.getHtmlElementDescendants().iterator();
+        final Iterator<HtmlElement> iterator2 = page2.getHtmlElementDescendants().iterator();
+        while (iterator1.hasNext()) {
+            assertTrue(iterator2.hasNext());
+            final HtmlElement element1 = iterator1.next();
+            final HtmlElement element2 = iterator2.next();
+            assertEquals(element1.getNodeName(), element2.getNodeName());
+        }
+        assertFalse(iterator2.hasNext());
+        assertEquals("Hello there!", page2.getHtmlElementById("myId").getFirstChild().getNodeValue());
+    }
+
     /**
      * Verifies that a cloned HtmlPage has its own "idMap_".
      * @throws Exception if the test fails