[HtmlUnit] CVS Commit: src/xdocs: make HtmlOption: msg#00054 java.htmlunit.devel

Log Message:
-----------
make HtmlOption.asText() more browser-like

Modified Files:
--------------
htmlunit/src/xdocs:
changes.xml

(http://cvs.sourceforge.net/viewcvs.py/htmlunit/htmlunit/src/xdocs/changes.xml)
htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html:
HtmlOptionTest.java

(http://cvs.sourceforge.net/viewcvs.py/htmlunit/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOptionTest.java)
htmlunit/src/java/com/gargoylesoftware/htmlunit/html:
HtmlOption.java

(http://cvs.sourceforge.net/viewcvs.py/htmlunit/htmlunit/src/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java)

Revision Data
-------------
Index: HtmlOptionTest.java
===================================================================
RCS file:
/cvsroot/htmlunit/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOptionTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lsrc/test/java/com/gargoylesoftware/htmlunit/html/HtmlOptionTest.java
-Lsrc/test/java/com/gargoylesoftware/htmlunit/html/HtmlOptionTest.java -u -d
-r1.16 -r1.17
--- src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOptionTest.java
+++ src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOptionTest.java
@@ -167,4 +167,27 @@
option1.click();
assertTrue(option1.isSelected());
}
+
+ /**
+ * @throws Exception if the test fails
+ */
+ public void testAsText() throws Exception {
+ final String htmlContent =
"<html><head><title>foo</title></head><body>"
+ + "<form><select>"
+ + "<option id='option1'>option1</option>"
+ + "<option id='option2' label='Number Two'/>"
+ + "<option id='option3' label='overridden'>Number Three</option>"
+ + "</select>"
+ + "</form></body></html>";
+
+ final HtmlPage page = loadPage(htmlContent);
+
+ final HtmlOption option1 = (HtmlOption)
page.getHtmlElementById("option1");
+ final HtmlOption option2 = (HtmlOption)
page.getHtmlElementById("option2");
+ final HtmlOption option3 = (HtmlOption)
page.getHtmlElementById("option3");
+
+ assertEquals("option1", option1.asText());
+ assertEquals("Number Two", option2.asText());
+ assertEquals("overridden", option3.asText());
+ }
}
Index: changes.xml
===================================================================
RCS file: /cvsroot/htmlunit/htmlunit/src/xdocs/changes.xml,v
retrieving revision 1.493
retrieving revision 1.494
diff -Lsrc/xdocs/changes.xml -Lsrc/xdocs/changes.xml -u -d -r1.493 -r1.494
--- src/xdocs/changes.xml
+++ src/xdocs/changes.xml
@@ -7,6 +7,9 @@

<body>
<release version="next">
+ <action type="update" dev="yourgod">
+ HtmlOption.asText() now respects the label attribute as
browsers do.
+ </action>
<action type="update" dev="mguillem" id="1437068">
Encode path part of urls containing illegal
characters.
</action>
Index: HtmlOption.java
===================================================================
RCS file:
/cvsroot/htmlunit/htmlunit/src/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lsrc/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java
-Lsrc/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java -u -d -r1.23
-r1.24
--- src/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java
+++ src/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java
@@ -262,4 +262,16 @@
removeAttribute("selected");
}
}
+
+ /**
+ * {@inheritDoc}
+ * This implementation will show the label attribute before the
+ * content of the tag if the attribute exists.
+ */
+ public String asText() {
+ if (getLabelAttribute() != ATTRIBUTE_NOT_DEFINED){
+ return getLabelAttribute();
+ }
+ return super.asText();
+ }
}

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642

Previous by Date:	[HtmlUnit] CVS Commit: DomText.java: toString() now returns asText() to facilitate, mguillem
Next by Date:	[HtmlUnit] CVS Commit: WebConnectionWrapper.java: @see -> {@inheritDoc}, yourgod
Previous by Thread:	[HtmlUnit] CVS Commit: DomText.java: toString() now returns asText() to facilitate, mguillem
Next by Thread:	[HtmlUnit] CVS Commit: WebConnectionWrapper.java: @see -> {@inheritDoc}, yourgod
Indexes:	[Date] [Thread] [Top] [All Lists]

<Prev in Thread]	Current Thread	[Next in Thread>

[HtmlUnit] CVS Commit: src/xdocs: make HtmlOption.asText() more browser-li: msg#00054

java.htmlunit.devel