whitespace gets removed from rowspan/colspan attributes when using rowSpan/colSpan properties

rbri · rbri · commit eecf51d171b7 · 2024-03-03T19:18:33.000+01:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -18,6 +18,9 @@
                 Jetty 9 websocket-client.
             </action>
 
+            <action type="fix" dev="Lai Quang Duong">
+                Whitespace gets removed from rowspan/colspan attributes when using rowSpan/colSpan properties.
+            </action>
             <action type="fix" dev="Lai Quang Duong">
                 Restore the ability to specify null as password value (regression in 3.4.0).
             </action>
diff --git a/src/main/java/org/htmlunit/html/HtmlTableCell.java b/src/main/java/org/htmlunit/html/HtmlTableCell.java
@@ -27,6 +27,7 @@
  * @author <a href="mailto:cse@dynabean.de">Christian Sell</a>
  * @author Ahmed Ashour
  * @author Frank Danek
+ * @author Lai Quang Duong
  * @see HtmlTableDataCell
  * @see HtmlTableHeaderCell
  */
diff --git a/src/main/java/org/htmlunit/javascript/host/html/HTMLTableCellElement.java b/src/main/java/org/htmlunit/javascript/host/html/HTMLTableCellElement.java
@@ -38,6 +38,7 @@
  * @author Daniel Gredler
  * @author Ronald Brill
  * @author Frank Danek
+ * @author Lai Quang Duong
  */
 @JsxClass(domClass = HtmlTableCell.class)
 public class HTMLTableCellElement extends HTMLTableComponent {
@@ -178,7 +179,7 @@ public void setBgColor(final String bgColor) {
      */
     @JsxGetter
     public int getColSpan() {
-        final String s = StringUtils.replaceChars(getDomNodeOrDie().getAttribute("colSpan"), "\r\n", null);
+        final String s = StringUtils.replaceChars(getDomNodeOrDie().getAttribute("colSpan"), "\r\n\t ", null);
         try {
             return Integer.parseInt(s);
         }
@@ -211,7 +212,7 @@ public void setColSpan(final String colSpan) {
      */
     @JsxGetter
     public int getRowSpan() {
-        final String s = StringUtils.replaceChars(getDomNodeOrDie().getAttribute("rowSpan"), "\r\n", null);
+        final String s = StringUtils.replaceChars(getDomNodeOrDie().getAttribute("rowSpan"), "\r\n\t ", null);
         try {
             return Integer.parseInt(s);
         }
diff --git a/src/test/java/org/htmlunit/javascript/host/html/HTMLTableCellElementTest.java b/src/test/java/org/htmlunit/javascript/host/html/HTMLTableCellElementTest.java
@@ -328,6 +328,28 @@ public void colSpan() throws Exception {
         loadPageVerifyTitle2(html);
     }
 
+    /**
+     * @throws Exception if an error occurs
+     */
+    @Test
+    @Alerts("3")
+    public void colSpanLineBreaks() throws Exception {
+        final String html
+            = "<html><body><table>\n"
+            + "  <tr>\n"
+            + "    <td id='td1' colspan='\r3\t\n  '>b</td>\n"
+            + "  </tr>\n"
+            + "</table>\n"
+            + "<script>\n"
+            + LOG_TITLE_FUNCTION_NORMALIZE
+            + "  var td1 = document.getElementById('td1');\n"
+            + "  log(td1.colSpan);\n"
+            + "</script>\n"
+            + "</body></html>";
+
+        loadPageVerifyTitle2(html);
+    }
+
     /**
      * @throws Exception if an error occurs
      */
@@ -382,6 +404,28 @@ public void rowSpan() throws Exception {
         loadPageVerifyTitle2(html);
     }
 
+    /**
+     * @throws Exception if an error occurs
+     */
+    @Test
+    @Alerts("3")
+    public void rowSpanLineBreaks() throws Exception {
+        final String html
+            = "<html><body><table>\n"
+            + "  <tr>\n"
+            + "    <td id='td1' rowspan='\r3\t\n  '>a</td>\n"
+            + "  </tr>\n"
+            + "</table>\n"
+            + "<script>\n"
+            + LOG_TITLE_FUNCTION_NORMALIZE
+            + "  var td1 = document.getElementById('td1');\n"
+            + "  log(td1.rowSpan);\n"
+            + "</script>\n"
+            + "</body></html>";
+
+        loadPageVerifyTitle2(html);
+    }
+
     /**
      * @throws Exception if an error occurs
      */
