Thread: [JWebUnit-development] SF.net SVN: jwebunit:[765] trunk/jwebunit-core/src/main/java/net/ sourcefor
Brought to you by:
henryju
Menu
▾
▴
jwebunit-development
|
From: <jev...@us...> - 2008-11-18 02:23:11
|
Revision: 765
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=765&view=rev
Author: jevonwright
Date: 2008-11-18 02:22:58 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
making getTestingEngine() tester method public
Modified Paths:
--------------
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
Modified: trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
===================================================================
--- trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java 2008-11-18 02:18:30 UTC (rev 764)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java 2008-11-18 02:22:58 UTC (rev 765)
@@ -79,7 +79,7 @@
*
* @return IJWebUnitDialog instance.
*/
- protected ITestingEngine getTestingEngine() {
+ public ITestingEngine getTestingEngine() {
if (testingEngine == null) {
// defaulting to the HtmlUnitDialog implementation.
testingEngine = initializeDialog();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jev...@us...> - 2009-11-30 06:24:07
|
Revision: 814
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=814&view=rev
Author: jevonwright
Date: 2009-11-30 06:23:59 +0000 (Mon, 30 Nov 2009)
Log Message:
-----------
moving logic behind private assertLabeleldFieldEquals to a new protected getLabeledFieldValue method, allowing for easier subclassing
Modified Paths:
--------------
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
Modified: trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
===================================================================
--- trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java 2009-09-03 12:56:30 UTC (rev 813)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java 2009-11-30 06:23:59 UTC (rev 814)
@@ -2727,15 +2727,30 @@
return fields;
}
+
/**
- * Private method to test the value of a field connected to a particular IElement label.
+ * Private method - test the value of a field connected to a particular IElement label.
*
- * @param label
- * @param fieldText
+ * @param identifier the HTML ID for the given labelled field
+ * @param label the label found for the given HTML field
+ * @param fieldText the value to check is equal
*/
private void assertLabeledFieldEquals(String identifier, IElement label, String fieldText) {
+ String value = getLabeledFieldValue(identifier, label);
+ Assert.assertEquals("value of field for label [" + identifier + "] should be [" + fieldText + "]", fieldText, value == null ? "" : value);
+ }
+
+ /**
+ * Get the current value of a given labelled field.
+ *
+ * @param identifier the HTML ID for the given labelled field
+ * @param label the label found for the given HTML ID
+ * @return the value found in a field for the given label/ID, or
+ * <code>null</code> if none was found
+ */
+ protected String getLabeledFieldValue(String identifier, IElement label) {
List<IElement> fields = getFieldsForLabel(label);
-
+
Assert.assertFalse("No field found for label [" + identifier + "]", fields.isEmpty());
String value = null;
// cycle through all fields trying to find value
@@ -2778,15 +2793,17 @@
}
}
- Assert.assertEquals("value of field for label [" + identifier + "] should be [" + fieldText + "]", fieldText, value == null ? "" : value);
+ return value;
}
/**
- * Assert that a labeled field exists (for the given id) and the
+ * Assert that a labeled field exists (for the given ID) and the
* field that it labels equals the given text
*
- * @param id
- * @param fieldText
+ * @param id the HTML ID for the given labelled field
+ * @param fieldText the text that the field's value should equal
+ * @see #getLabeledFieldValue(String, IElement, String)
+ * @see #getLabel(String)
*/
public void assertLabeledFieldEquals(String id, String fieldText) {
IElement label = getLabel(id);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jev...@us...> - 2010-05-17 07:18:43
|
Revision: 837
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=837&view=rev
Author: jevonwright
Date: 2010-05-17 07:18:37 +0000 (Mon, 17 May 2010)
Log Message:
-----------
making getFieldsForLabel() public, to permit extensions to use the same Label dereferencing algorithm as JWebUnit
Modified Paths:
--------------
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
Modified: trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
===================================================================
--- trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java 2010-05-17 06:46:09 UTC (rev 836)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java 2010-05-17 07:18:37 UTC (rev 837)
@@ -2717,12 +2717,13 @@
}
/**
- * Get all the fields that are referenced or contained in a particular label.
+ * Get all the fields of type <code>input</code>, <code>textarea</code> or <code>select</code>
+ * that are referenced or contained in a particular label.
*
* @param label The label to consider
* @return A list of all fields contained or referenced in this label
*/
- private List<IElement> getFieldsForLabel(IElement label) {
+ public List<IElement> getFieldsForLabel(IElement label) {
List<IElement> fields = new java.util.ArrayList<IElement>();
// a direct "for" attribute
if (label.getAttribute("for") != null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jev...@us...> - 2010-06-14 01:34:12
|
Revision: 838
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=838&view=rev
Author: jevonwright
Date: 2010-06-14 01:34:03 +0000 (Mon, 14 Jun 2010)
Log Message:
-----------
issue 3015648: WebTester.assertResponseCode backwards
Modified Paths:
--------------
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
Modified: trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
===================================================================
--- trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java 2010-05-17 07:18:37 UTC (rev 837)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java 2010-06-14 01:34:03 UTC (rev 838)
@@ -295,7 +295,7 @@
* @param status the expected status code
*/
public void assertResponseCode(int status) {
- Assert.assertEquals( getTestingEngine().getServerResponseCode(), status );
+ Assert.assertEquals( status, getTestingEngine().getServerResponseCode() );
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2011-09-23 14:20:05
|
Revision: 918
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=918&view=rev
Author: henryju
Date: 2011-09-23 14:19:55 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Support optgroup in getLabeledFieldValue. Minor cleanup in WebTester.
Modified Paths:
--------------
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
Modified: trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
===================================================================
--- trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java 2011-09-23 14:17:12 UTC (rev 917)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java 2011-09-23 14:19:55 UTC (rev 918)
@@ -2757,7 +2757,7 @@
private IElement getLabel(String id) {
// get all labels
for (IElement e : getTestingEngine().getElementsByXPath("//label")) {
- if (e.getName().equals("label") && id.equals(e.getAttribute("id")))
+ if (id.equals(e.getAttribute("id")))
return e; // label found
}
return null;
@@ -2838,7 +2838,7 @@
*/
private void assertLabeledFieldEquals(String identifier, IElement label, String fieldText) {
String value = getLabeledFieldValue(identifier, label);
- assertEquals("value of field for label [" + identifier + "] should be [" + fieldText + "]", fieldText, value == null ? "" : value);
+ assertEquals("unexpected value of field for label [" + identifier + "]", fieldText, value == null ? "" : value);
}
/**
@@ -2883,12 +2883,20 @@
value = field.getTextContent();
} else if ("select".equals(field.getName())) {
// get the selected option
- for (IElement children : field.getChildren()) {
- if (children.getName().equals("option") && children.getAttribute("selected") != null) {
- value = children.getAttribute("value") == null ? children.getTextContent() : children.getAttribute("value");
- break;
- }
- }
+ for (IElement child : field.getChildren()) {
+ if (child.getName().equals("option") && child.getAttribute("selected") != null) {
+ value = child.getAttribute("value") == null ? child.getTextContent() : child.getAttribute("value");
+ break;
+ }
+ if (child.getName().equals("optgroup")) {
+ for (IElement subchild : child.getChildren()) {
+ if (subchild.getName().equals("option") && subchild.getAttribute("selected") != null) {
+ value = child.getAttribute("value") == null ? child.getTextContent() : child.getAttribute("value");
+ break;
+ }
+ }
+ }
+ }
} else {
throw new RuntimeException("Unexpected field type " + field.getName());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X