Remove HttpUnit dialog.

Clean everything before releasing.

Author: henryju

jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java

@@ -26,7 +26,7 @@ public void testAssertTableEquals() throws Throwable {
         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 @@ public void testAssertTableEqualsMissingRows() throws Throwable {
         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);

jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java

@@ -26,7 +26,7 @@ public void testAssertTableEquals() throws Throwable {
         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 @@ public void testAssertTableEqualsMissingRows() throws Throwable {
         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);

jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionCheckboxesTest.java

@@ -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

jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionWithLabelTest.java

@@ -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>

jwebunit-commons-tests/src/main/resources/testcases/ExpectedTableAssertionsTest/TableAssertionsTestPageHtml.html

@@ -650,81 +650,4 @@ void beginAt(String aInitialURL, TestContext aTestContext)
      *            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);
-
 }

jwebunit-commons-tests/src/main/resources/testcases/ExpectedTableAssertionsTest/TableAssertionsTestPageXHtml.html

@@ -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() {
@@ -39,34 +33,13 @@ public TestingEngineRegistry() {
     public static Hashtable getTestingEngineMap() {
         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;
     }