Revision: 503
Author: henryju
Date: 2006-06-26 02:38:38 -0700 (Mon, 26 Jun 2006)
ViewCVS: http://svn.sourceforge.net/jwebunit/?rev=503&view=rev
Log Message:
-----------
Remove HttpUnit dialog.
Clean everything before releasing.
Modified Paths:
--------------
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
branches/1.x/jwebunit-commons-tests/src/main/resources/testcases/ExpectedTableAssertionsTest/TableAssertionsTestPageHtml.html
branches/1.x/jwebunit-commons-tests/src/main/resources/testcases/ExpectedTableAssertionsTest/TableAssertionsTestPageXHtml.html
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/IJWebUnitDialog.java
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/TestingEngineRegistry.java
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTestCase.java
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTester.java
branches/1.x/jwebunit-htmlunit-plugin/pom.xml
branches/1.x/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
branches/1.x/pom.xml
Removed Paths:
-------------
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionCheckboxesTest.java
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionWithLabelTest.java
branches/1.x/jwebunit-httpunit-plugin/
Modified:
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java
===================================================================
---
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java
2006-06-22 14:50:26 UTC (rev 502)
+++
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java
2006-06-26 09:38:38 UTC (rev 503)
@@ -26,7 +26,7 @@
cells[0] = new Cell[3];
cells[0][0]=new Cell("",1,2);
cells[0][1]=new Cell("Average",2,1);
- cells[0][2]=new Cell("Red\neyes",1,2);
+ cells[0][2]=new Cell("Red eyes",1,2);
cells[1] = new Cell[2];
cells[1][0]=new Cell("height",1,1);
cells[1][1]=new Cell("weight",1,1);
@@ -49,7 +49,7 @@
cells[0] = new Cell[3];
cells[0][0]=new Cell("",1,2);
cells[0][1]=new Cell("Average",2,1);
- cells[0][2]=new Cell("Red\neyes",1,2);
+ cells[0][2]=new Cell("Red eyes",1,2);
cells[1] = new Cell[2];
cells[1][0]=new Cell("height",1,1);
cells[1][1]=new Cell("weight",1,1);
Modified:
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
===================================================================
---
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
2006-06-22 14:50:26 UTC (rev 502)
+++
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
2006-06-26 09:38:38 UTC (rev 503)
@@ -26,7 +26,7 @@
cells[0] = new Cell[3];
cells[0][0]=new Cell("",1,2);
cells[0][1]=new Cell("Average",2,1);
- cells[0][2]=new Cell("Red\neyes",1,2);
+ cells[0][2]=new Cell("Red eyes",1,2);
cells[1] = new Cell[2];
cells[1][0]=new Cell("height",1,1);
cells[1][1]=new Cell("weight",1,1);
@@ -49,7 +49,7 @@
cells[0] = new Cell[3];
cells[0][0]=new Cell("",1,2);
cells[0][1]=new Cell("Average",2,1);
- cells[0][2]=new Cell("Red\neyes",1,2);
+ cells[0][2]=new Cell("Red eyes",1,2);
cells[1] = new Cell[2];
cells[1][0]=new Cell("height",1,1);
cells[1][1]=new Cell("weight",1,1);
Deleted:
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionCheckboxesTest.java
===================================================================
---
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionCheckboxesTest.java
2006-06-22 14:50:26 UTC (rev 502)
+++
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionCheckboxesTest.java
2006-06-26 09:38:38 UTC (rev 503)
@@ -1,71 +0,0 @@
-package net.sourceforge.jwebunit.tests;
-
-import net.sourceforge.jwebunit.tests.util.JettySetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Test form submission where checkbox name+value is not known.
- */
-public class FormSubmissionCheckboxesTest extends JWebUnitAPITestCase {
-
- public static Test suite() {
- Test suite = new TestSuite(FormSubmissionCheckboxesTest.class);
- return new JettySetup(suite);
- }
-
- public void setUp() throws Exception {
- super.setUp();
- getTestContext().setBaseUrl(HOST_PATH + "/FormSubmissionTest/");
- }
-
- public void testCheckboxIdentificationLabelBeforeBox() {
- beginAt("CheckboxFormWithLabels.html");
- assertFormPresent();
- // we don't know the name or value, just the label
- checkCheckboxWithLabel("Check 20");
- assertFormElementEquals("chk", "20");
- submit();
- assertTextPresent(" chk=20 ");
- }
-
- public void testCheckboxIdentificationLabelAfterBox1() {
- doTestCheckboxBefore(1);
- }
-
- /**
- * Extracting test logic because it must be improved to use jetty
- * @param value
- */
- private void doTestCheckboxBefore(int value) {
- beginAt("CheckboxFormWithLabels.html");
- checkCheckboxBeforeLabel("Check " + value);
- assertFormElementEquals("chk", "" + value);
- submit();
- assertTextPresent(" chk=" + value + " ");
- }
-
- public void testCheckboxIdentificationLabelAfterBox2() {
- doTestCheckboxBefore(5);
- }
-
- public void testCheckboxIdentificationLabelAfterBox3() {
- doTestCheckboxBefore(3);
- }
-
- private void doTestRadioBefore(int value) {
- beginAt("CheckboxFormWithLabels.html");
- checkCheckboxBeforeLabel("Radio " + value);
- assertRadioOptionSelected("radio", "" + value);
- submit();
- assertTextPresent(" radio=" + value + " ");
- }
-
- public void testCheckboxIdentificationLabelAfterBox10() {
- doTestRadioBefore(10);
- }
-
- public void testCheckboxIdentificationLabelAfterBox11() {
- doTestRadioBefore(11);
- }
-}
\ No newline at end of file
Deleted:
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionWithLabelTest.java
===================================================================
---
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionWithLabelTest.java
2006-06-22 14:50:26 UTC (rev 502)
+++
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionWithLabelTest.java
2006-06-26 09:38:38 UTC (rev 503)
@@ -1,46 +0,0 @@
-package net.sourceforge.jwebunit.tests;
-
-import net.sourceforge.jwebunit.tests.util.JettySetup;
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Test form submission related methods of WebTestCase.
- *
- * If there is more than one submit button on a page, WebTestCase / httpunit
- * require indication of which button to submit with prior to form submission.
- *
- * @author Jim Weaver
- */
-public class FormSubmissionWithLabelTest extends JWebUnitAPITestCase {
-
- public static Test suite() {
- Test suite = new TestSuite(FormSubmissionWithLabelTest.class);
- return new JettySetup(suite);
- }
-
- public void setUp() throws Exception {
- super.setUp();
- getTestContext().setBaseUrl(HOST_PATH + "/FormSubmissionTest");
- }
-
- public void testSimpleLabeledForm() {
- beginAt("/QueryFormSimple.html");
- setFormElementWithLabel("First", "oneValue");
- setFormElementWithLabel("Second", "anotherValue");
- submit();
- assertTextPresent(" param1=oneValue ");
- assertTextPresent(" param2=anotherValue ");
- }
-
- public void testTrickyLabeledForm() {
- beginAt("/QueryFormTricky.html");
- setFormElementWithLabel("Trick", "oneValue");
- setFormElementWithLabel("Treat", "anotherValue");
- submit();
- assertTextPresent(" param3=oneValue ");
- assertTextPresent(" param4=anotherValue ");
- }
-
-}
\ No newline at end of file
Modified:
branches/1.x/jwebunit-commons-tests/src/main/resources/testcases/ExpectedTableAssertionsTest/TableAssertionsTestPageHtml.html
===================================================================
---
branches/1.x/jwebunit-commons-tests/src/main/resources/testcases/ExpectedTableAssertionsTest/TableAssertionsTestPageHtml.html
2006-06-22 14:50:26 UTC (rev 502)
+++
branches/1.x/jwebunit-commons-tests/src/main/resources/testcases/ExpectedTableAssertionsTest/TableAssertionsTestPageHtml.html
2006-06-26 09:38:38 UTC (rev 503)
@@ -12,8 +12,7 @@
<tr>
<th rowspan="2">
<th colspan="2">Average
- <th rowspan="2">Red<br>
- eyes
+ <th rowspan="2">Red eyes
<tr>
<th>height
<th>weight
Modified:
branches/1.x/jwebunit-commons-tests/src/main/resources/testcases/ExpectedTableAssertionsTest/TableAssertionsTestPageXHtml.html
===================================================================
---
branches/1.x/jwebunit-commons-tests/src/main/resources/testcases/ExpectedTableAssertionsTest/TableAssertionsTestPageXHtml.html
2006-06-22 14:50:26 UTC (rev 502)
+++
branches/1.x/jwebunit-commons-tests/src/main/resources/testcases/ExpectedTableAssertionsTest/TableAssertionsTestPageXHtml.html
2006-06-26 09:38:38 UTC (rev 503)
@@ -15,7 +15,7 @@
<tr>
<th rowspan="2" />
<th colspan="2">Average</th>
- <th rowspan="2">Red<br/>eyes</th>
+ <th rowspan="2">Red eyes</th>
</tr>
<tr>
<th>height</th>
Modified:
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/IJWebUnitDialog.java
===================================================================
---
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/IJWebUnitDialog.java
2006-06-22 14:50:26 UTC (rev 502)
+++
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/IJWebUnitDialog.java
2006-06-26 09:38:38 UTC (rev 503)
@@ -650,81 +650,4 @@
* regexp to match.
*/
boolean isMatchInElement(String elementID, String regexp);
-
- // *****************************************************************
- // DEPRECATED OR NOT EASY TO IMPLEMENT (TO REMOVE)
- // *****************************************************************
- /**
- * Get the name of the first input element appearing before a text label.
- *
- * @param formElementLabel
- * the input element label
- * @return the 'name' attribute of the first input element preceding the
- * text
- * @deprecated label is not a good way to locate elements
- */
- String getFormElementNameBeforeLabel(String formElementLabel);
-
- /**
- * Get the vale of the first input element appearing before a text label.
- *
- * @param formElementLabel
- * the input element label
- * @return the 'value' attribute of the first input element preceding the
- * text
- * @deprecated label is not a good way to locate elements
- */
- String getFormElementValueBeforeLabel(String formElementLabel);
-
- /**
- * Get the value of the first input element appearing after a text label.
- *
- * @param formElementLabel
- * the input element label
- * @return the 'name' attribute of the first input element preceding the
- * text
- * @deprecated label is not a good way to locate elements
- */
- String getFormElementValueForLabel(String formElementLabel);
-
-
- /**
- * Set a form parameter / input element to the provided value.
- *
- * @param paramName
- * name of the input element
- * @param paramValue
- * parameter value to submit for the element.
- * @deprecated use setTextField, checkCheckBox, ...
- */
- void setFormParameter(String paramName, String paramValue);
-
- /**
- * Return true if a form parameter (input element) is present on the
current
- * response preceded by a given label.
- *
- * @param paramLabel
- * label of the input element to check for
- * @deprecated label is not a good way to locate elements
- */
- boolean hasFormParameterLabeled(String paramLabel);
-
- /**
- * Return the name of a form parameter (input element) on the current
- * response preceded by a givel label.
- *
- * @param formElementLabel
- * label of the input element to fetch name.
- * @deprecated label is not a good way to locate elements
- */
- String getFormElementNameForLabel(String formElementLabel);
-
- /**
- *
- * @param linkText
- * @param labelText
- * @deprecated this is not a good way to locate elements
- */
- void clickLinkWithTextAfterText(String linkText, String labelText);
-
}
\ No newline at end of file
Modified:
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/TestingEngineRegistry.java
===================================================================
---
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/TestingEngineRegistry.java
2006-06-22 14:50:26 UTC (rev 502)
+++
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/TestingEngineRegistry.java
2006-06-26 09:38:38 UTC (rev 503)
@@ -18,14 +18,8 @@
public class TestingEngineRegistry {
// TODO Move this to a JDK1.5 typesafe enum
- public final static String TESTING_ENGINE_HTTPUNIT =
"TestingEngineHttpUnit";
-
public final static String TESTING_ENGINE_HTMLUNIT =
"TestingEngineHtmlUnit";
- public final static String TESTING_ENGINE_JACOBIE = "TestingEngineJacobie";
-
- public final static String TESTING_ENGINE_SELENIUM =
"TestingEngineSelenium";
-
private static Hashtable testingEngineMap = null;
public TestingEngineRegistry() {
@@ -40,33 +34,12 @@
if (testingEngineMap == null) {
testingEngineMap = new Hashtable();
try {
- String cp = "net.sourceforge.jwebunit.httpunit.HttpUnitDialog";
- Class.forName(cp);
- testingEngineMap.put(TESTING_ENGINE_HTTPUNIT, cp);
- } catch (ClassNotFoundException e) {
- //Nothing to do
- }
- try {
String cp = "net.sourceforge.jwebunit.htmlunit.HtmlUnitDialog";
Class.forName(cp);
testingEngineMap.put(TESTING_ENGINE_HTMLUNIT, cp);
} catch (ClassNotFoundException e) {
//Nothing to do
}
- try {
- String cp = "net.sourceforge.jwebunit.jacobie.JacobieDialog";
- Class.forName(cp);
- testingEngineMap.put(TESTING_ENGINE_JACOBIE, cp);
- } catch (ClassNotFoundException e) {
- //Nothing to do
- }
- try {
- String cp = "net.sourceforge.jwebunit.selenium.SeleniumDialog";
- Class.forName(cp);
- testingEngineMap.put(TESTING_ENGINE_SELENIUM, cp);
- } catch (ClassNotFoundException e) {
- //Nothing to do
- }
}
return testingEngineMap;
}
Modified:
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTestCase.java
===================================================================
---
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTestCase.java
2006-06-22 14:50:26 UTC (rev 502)
+++
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTestCase.java
2006-06-26 09:38:38 UTC (rev 503)
@@ -64,7 +64,7 @@
/**
* Select the Testing Engine that you want to use for the tests. If this
- * isn't called, then jWebUnit will default to using httpunit as the
testing
+ * isn't called, then jWebUnit will default to using htmlunit as the
testing
* engine.
*/
public void setTestingEngineKey(String aTestingEngineKey) {
@@ -197,8 +197,7 @@
tester.assertNoMatchInTable(tableSummaryOrId, regexp);
}
- public void assertTableEquals(String tableSummaryOrId,
- Table expectedTable) {
+ public void assertTableEquals(String tableSummaryOrId, Table
expectedTable) {
getTester().assertTableEquals(tableSummaryOrId, expectedTable);
}
@@ -213,8 +212,10 @@
expectedTable);
}
- public void assertTableRowCountEquals(String tableSummaryOrId, int
expectedRowCount) {
- getTester().assertTableRowCountEquals(tableSummaryOrId,
expectedRowCount);
+ public void assertTableRowCountEquals(String tableSummaryOrId,
+ int expectedRowCount) {
+ getTester().assertTableRowCountEquals(tableSummaryOrId,
+ expectedRowCount);
}
public void assertTableRowsEqual(String tableSummaryOrId, int startRow,
@@ -223,8 +224,7 @@
expectedCellValues);
}
- public void assertTableMatch(String tableSummaryOrId,
- Table expectedTable) {
+ public void assertTableMatch(String tableSummaryOrId, Table expectedTable)
{
getTester().assertTableMatch(tableSummaryOrId, expectedTable);
}
@@ -252,14 +252,6 @@
getTester().assertFormElementNotPresent(formElementName);
}
- public void assertFormElementPresentWithLabel(String formElementLabel) {
- getTester().assertFormElementPresentWithLabel(formElementLabel);
- }
-
- public void assertFormElementNotPresentWithLabel(String formElementLabel) {
- getTester().assertFormElementNotPresentWithLabel(formElementLabel);
- }
-
public void assertFormPresent() {
getTester().assertFormPresent();
}
@@ -406,7 +398,8 @@
}
/**
- * @see
net.sourceforge.jwebunit.WebTester#assertSubmitButtonPresent(String, String)
+ * @see
net.sourceforge.jwebunit.WebTester#assertSubmitButtonPresent(String,
+ * String)
*/
public void assertSubmitButtonPresent(String buttonName,
String expectedValue) {
@@ -606,23 +599,10 @@
getTester().setWorkingForm(nameOrId);
}
- /**
- * @deprecated use setTextField or others methods
- * @param formElementName
- * @param value
- */
- public void setFormElement(String formElementName, String value) {
- getTester().setFormElement(formElementName, value);
- }
-
public void setTextField(String textFieldName, String value) {
getTester().setTextField(textFieldName, value);
}
- public void setFormElementWithLabel(String formElementLabel, String value)
{
- getTester().setFormElementWithLabel(formElementLabel, value);
- }
-
/**
* Select a specified checkbox. If the checkbox is already checked then the
* checkbox will stay checked.
@@ -647,14 +627,6 @@
getTester().checkCheckbox(checkBoxName, value);
}
- public void checkCheckboxWithLabel(String formElementLabel) {
- getTester().checkCheckboxWithLabel(formElementLabel);
- }
-
- public void checkCheckboxBeforeLabel(String formElementLabel) {
- getTester().checkCheckboxBeforeLabel(formElementLabel);
- }
-
/**
* Deselect a specified checkbox. If the checkbox is already unchecked then
* the checkbox will stay unchecked.
@@ -742,14 +714,6 @@
}
/**
- *
- * @deprecated
- */
- protected void clickLinkWithTextAfterText(String linkText, String
labelText) {
- getTester().clickLinkWithTextAfterText(linkText, labelText);
- }
-
- /**
* Navigate by selection of a link with a given image.
*
* @param imageFileName
@@ -776,7 +740,7 @@
protected void clickRadioOption(String radioGroup, String radioOption) {
getTester().clickRadioOption(radioGroup, radioOption);
}
-
+
/**
* Click element with given xpath.
*
@@ -787,9 +751,6 @@
getTester().clickElementByXPath(xpath);
}
-
- // Window and Frame Navigation Methods
-
public void gotoRootWindow() {
getTester().gotoRootWindow();
}
@@ -814,10 +775,7 @@
getTester().dumpCookies();
}
- /**
- * Patch sumbitted by Alex Chaffee.
- */
- public void gotoPage(String page) {
+ protected void gotoPage(String page) {
getTester().gotoPage(page);
}
Modified:
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTester.java
===================================================================
---
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTester.java
2006-06-22 14:50:26 UTC (rev 502)
+++
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTester.java
2006-06-26 09:38:38 UTC (rev 503)
@@ -44,13 +44,13 @@
* functionality not yet wrappered required by test.
*
* If the dialog is not explicitly set the jWebUnit framework will default
- * to using the orignal testing engine, which is, httpunit.
+ * to using the orignal testing engine, which is, htmlunit.
*
- * @return IJWebUnitDialog instance used to wrapper httpunit conversation.
+ * @return IJWebUnitDialog instance used to wrapper htmlunit conversation.
*/
public IJWebUnitDialog getDialog() {
if (dialog == null) {
- // defaulting to the HttpUnitDialog implementation.
+ // defaulting to the HtmlUnitDialog implementation.
dialog = initializeDialog();
}
return dialog;
@@ -91,7 +91,7 @@
}
/**
- * Close the current Dialog
+ * Close the current conversation
*/
public void closeBrowser() {
try {
@@ -662,33 +662,6 @@
}
/**
- * Assert that a form input element with a given label is present.
- *
- * @param formElementLabel
- * label preceding form element.
- * @see #setFormElementWithLabel(String,String)
- * @deprecated
- */
- public void assertFormElementPresentWithLabel(String formElementLabel) {
- Assert.assertTrue("Did not find form element with label ["
- + formElementLabel + "].", getDialog().hasFormParameterLabeled(
- formElementLabel));
- }
-
- /**
- * Assert that a form input element with a given label is not present.
- *
- * @param formElementLabel
- * label preceding form element.
- * @see #setFormElementWithLabel(String,String)
- * @deprecated
- */
- public void assertFormElementNotPresentWithLabel(String formElementLabel) {
- Assert.assertFalse("Found form element with label [" + formElementLabel
- + "].", getDialog().hasFormParameterLabeled(formElementLabel));
- }
-
- /**
* Assert that there is a form present.
*
*/
@@ -1616,20 +1589,6 @@
}
/**
- * Set the value of a form input element.
- *
- * @param formElementName
- * name of form element.
- * @param value
- * @deprecated use setTextField or other methods
- */
- public void setFormElement(String formElementName, String value) {
- assertFormPresent();
- assertFormElementPresent(formElementName);
- getDialog().setFormParameter(formElementName, value);
- }
-
- /**
* Set the value of a text or password input field.
*
* @param inputName
@@ -1644,25 +1603,6 @@
}
/**
- * Set the value of a form input element. The element is identified by a
- * preceding "label". For example, in "<code>Home Address : <input
- * type='text' name='home_addr' /></code>", "
- * <code>Home Address</code>" could be used as a label. The label must
- * appear within the associated <code><form></code> tag.
- *
- * @param formElementLabel
- * label preceding form element.
- * @param value
- * @deprecated
- */
- public void setFormElementWithLabel(String formElementLabel, String value)
{
- String name = getDialog().getFormElementNameForLabel(formElementLabel);
- Assert.assertNotNull("Did not find form element with label ["
- + formElementLabel + "].", name);
- getDialog().setFormParameter(name, value);
- }
-
- /**
* Select a specified checkbox. If the checkbox is already checked then the
* checkbox will stay checked.
*
@@ -1689,51 +1629,6 @@
}
/**
- * Identifies and checks checkbox based on a label appearing before the
- * input tag.
- *
- * Checkboxes are identified by name+value. If both are known, use
- * [EMAIL PROTECTED] #checkCheckbox(String, String)} or
- * [EMAIL PROTECTED] #setFormElement(String, String)} to check the box. If
name or value
- * is unknown, use this method if there is a known text label appearing
- * after the checkbox.
- *
- * @param formElementLabel
- * The text label, appearing after the checkbox
- * @deprecated
- */
- public void checkCheckboxBeforeLabel(String formElementLabel) {
- assertTextPresent(formElementLabel);
- String name = getDialog().getFormElementNameBeforeLabel(
- formElementLabel);
- String value = getDialog().getFormElementValueBeforeLabel(
- formElementLabel);
- checkCheckbox(name, value);
- }
-
- /**
- * Identifies and checks checkbox based on a label appearing after the
input
- * tag.
- *
- * Checkboxes are identified by name+value. If both are known, use
- * [EMAIL PROTECTED] #checkCheckbox(String, String)} or
- * [EMAIL PROTECTED] #setFormElement(String, String)} to check the box. If
name or value
- * is unknown, use this method if there is a known text label appearing
- * before the checkbox.
- *
- * @param formElementLabel
- * The text label, appearing after the checkbox
- * @deprecated
- */
- public void checkCheckboxWithLabel(String formElementLabel) {
- assertTextPresent(formElementLabel);
- String name = getDialog().getFormElementNameForLabel(formElementLabel);
- String value = getDialog()
- .getFormElementValueForLabel(formElementLabel);
- checkCheckbox(name, value);
- }
-
- /**
* Deselect a specified checkbox. If the checkbox is already unchecked then
* the checkbox will stay unchecked.
*
@@ -1905,16 +1800,6 @@
}
/**
- * Search for labelText in the document, then search forward until finding
a
- * link called linkText. Click it.
- *
- * @deprecated
- */
- public void clickLinkWithTextAfterText(String linkText, String labelText) {
- getDialog().clickLinkWithTextAfterText(linkText, labelText);
- }
-
- /**
* Click the button with the given id.
*
* @param buttonId
Modified: branches/1.x/jwebunit-htmlunit-plugin/pom.xml
===================================================================
--- branches/1.x/jwebunit-htmlunit-plugin/pom.xml 2006-06-22 14:50:26 UTC
(rev 502)
+++ branches/1.x/jwebunit-htmlunit-plugin/pom.xml 2006-06-26 09:38:38 UTC
(rev 503)
@@ -1,69 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <parent>
- <artifactId>jwebunit</artifactId>
- <groupId>net.sourceforge.jwebunit</groupId>
- <version>1.3-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jwebunit-htmlunit-plugin</artifactId>
- <name>HtmlUnit Plugin</name>
- <description>HtmlUnit plugin for jWebUnit.</description>
- <repositories>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <parent>
+ <artifactId>jwebunit</artifactId>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <version>1.3-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jwebunit-htmlunit-plugin</artifactId>
+ <name>HtmlUnit Plugin</name>
+ <description>HtmlUnit plugin for jWebUnit.</description>
+ <repositories>
<repository>
- <snapshots />
- <id>jwebunit-m2-repo-snapshots-web</id>
- <name>JWebUnit snapshots repository</name>
- <url>http://jwebunit.sourceforge.net/m2-repo-snapshots</url>
+ <releases />
+ <id>jwebunit-m2-repo-web</id>
+ <name>JWebUnit repository</name>
+ <url>http://jwebunit.sourceforge.net/m2-repo</url>
</repository>
- </repositories>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>**/*Test.java</include>
- <include>**/*Tests.java</include>
- </includes>
- <excludes>
- <exclude>**/*AbstractTest.java</exclude>
- <exclude>**/*AbstractTests.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>1.9-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-core</artifactId>
- <version>1.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-commons-tests</artifactId>
- <version>1.3-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <topDirectoryLocation>..</topDirectoryLocation>
- </properties>
+ </repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/*Tests.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/*AbstractTest.java</exclude>
+ <exclude>**/*AbstractTests.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-core</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-commons-tests</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ </properties>
</project>
\ No newline at end of file
Modified:
branches/1.x/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
===================================================================
---
branches/1.x/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
2006-06-22 14:50:26 UTC (rev 502)
+++
branches/1.x/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
2006-06-26 09:38:38 UTC (rev 503)
@@ -1471,7 +1471,7 @@
* @param text
* text to check for.
*/
- public boolean isTextInElement(HtmlElement element, String text) {
+ private boolean isTextInElement(HtmlElement element, String text) {
return element.asText().indexOf(text) >= 0;
}
@@ -1487,7 +1487,7 @@
* @param regexp
* regexp to match.
*/
- public boolean isMatchInElement(HtmlElement element, String regexp) {
+ private boolean isMatchInElement(HtmlElement element, String regexp) {
RE re = getRE(regexp);
return re.match(element.asText());
}
@@ -1536,32 +1536,4 @@
return testContext;
}
- public void clickLinkWithTextAfterText(String linkText, String labelText) {
- throw new UnsupportedOperationException("clickLinkWithTextAfterText");
- }
-
- public String getFormElementNameBeforeLabel(String formElementLabel) {
- throw new
UnsupportedOperationException("getFormElementNameBeforeLabel");
- }
-
- public String getFormElementNameForLabel(String formElementLabel) {
- throw new UnsupportedOperationException("getFormElementNameForLabel");
- }
-
- public String getFormElementValueBeforeLabel(String formElementLabel) {
- throw new UnsupportedOperationException(
- "getFormElementValueBeforeLabel");
- }
-
- public String getFormElementValueForLabel(String formElementLabel) {
- throw new UnsupportedOperationException("getFormElementValueForLabel");
- }
-
- public boolean hasFormParameterLabeled(String paramLabel) {
- throw new UnsupportedOperationException("hasFormParameterLabeled");
- }
-
- public void setFormParameter(String paramName, String paramValue) {
- setTextField(paramName, paramValue);
- }
}
\ No newline at end of file
Modified: branches/1.x/pom.xml
===================================================================
--- branches/1.x/pom.xml 2006-06-22 14:50:26 UTC (rev 502)
+++ branches/1.x/pom.xml 2006-06-26 09:38:38 UTC (rev 503)
@@ -26,7 +26,6 @@
<modules>
<module>jwebunit-core</module>
<module>jwebunit-commons-tests</module>
- <module>jwebunit-httpunit-plugin</module>
<module>jwebunit-htmlunit-plugin</module>
</modules>
<mailingLists>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Jwebunit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
