more unit tests (using #137 as inspiration) and fix for #140

rbri · rbri · commit fbc2bca394b0 · 2023-11-09T19:21:07.000+01:00
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitWebElement.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitWebElement.java
@@ -336,7 +336,10 @@ public String getAttribute(final String name) {
             }
 
             final String attributeValue = element_.getAttribute(name);
-            return attributeValue == null ? "" : attributeValue;
+            if (ATTRIBUTE_NOT_DEFINED == attributeValue) {
+                return null;
+            }
+            return attributeValue;
         }
 
         if ("disabled".equals(lowerName)) {
diff --git a/src/test/java/org/openqa/selenium/htmlunit/HtmlUnitWebElementAttributeTest.java b/src/test/java/org/openqa/selenium/htmlunit/HtmlUnitWebElementAttributeTest.java
@@ -114,6 +114,46 @@ public void valueOption() throws Exception {
         assertEquals("4", elem.getAttribute("value"));
     }
 
+    @Test
+    public void valueDiv() throws Exception {
+        final String html = "<html>\n"
+                        + "<head>\n"
+                        + "</head>\n"
+                        + "<body>\n"
+                        + "  <div id='d1'>1</div>\n"
+                        + "  <div id='d2' value='two'>2</div>\n"
+                        + "</body>\n"
+                        + "</html>\n";
+
+        final WebDriver driver = loadPage2(html);
+
+        WebElement elem = driver.findElement(By.id("d1"));
+        assertNull(elem.getAttribute("value"));
+
+        elem = driver.findElement(By.id("d2"));
+        assertEquals("two", elem.getAttribute("value"));
+    }
+
+    @Test
+    public void valueP() throws Exception {
+        final String html = "<html>\n"
+                        + "<head>\n"
+                        + "</head>\n"
+                        + "<body>\n"
+                        + "  <p id='d1'>1</p>\n"
+                        + "  <p id='d2' value='two'>2</p>\n"
+                        + "</body>\n"
+                        + "</html>\n";
+
+        final WebDriver driver = loadPage2(html);
+
+        WebElement elem = driver.findElement(By.id("d1"));
+        assertNull(elem.getAttribute("value"));
+
+        elem = driver.findElement(By.id("d2"));
+        assertEquals("two", elem.getAttribute("value"));
+    }
+
     @Test
     public void checkbox() throws Exception {
         final String html = "<html>\n"

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,10 @@ public String getAttribute(final String name) {`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`final String attributeValue = element_.getAttribute(name);`
`339`		`- return attributeValue == null ? "" : attributeValue;`
	`339`	`+ if (ATTRIBUTE_NOT_DEFINED == attributeValue) {`
	`340`	`+ return null;`
	`341`	`+ }`
	`342`	`+ return attributeValue;`
`340`	`343`	`}`
`341`	`344`
`342`	`345`	`if ("disabled".equals(lowerName)) {`