Revision: 486
Author: henryju
Date: 2006-06-21 01:09:37 -0700 (Wed, 21 Jun 2006)
ViewCVS: http://svn.sourceforge.net/jwebunit/?rev=486&view=rev
Log Message:
-----------
Fix multiple test cases.
Modified Paths:
--------------
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/CharsetTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JWebUnitAPITestCase.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JavaScriptEventsTest.java
trunk/jwebunit-commons-tests/src/main/resources/testcases/TableAssertionsTest/TableAssertionsTestPage.html
trunk/jwebunit-httpunit-plugin/src/main/java/net/sourceforge/jwebunit/httpunit/HttpUnitDialog.java
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/CharsetTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/CharsetTest.java
2006-06-20 09:39:00 UTC (rev 485)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/CharsetTest.java
2006-06-21 08:09:37 UTC (rev 486)
@@ -26,7 +26,6 @@
public void testEuro() {
assertFormElementEquals("eur", "\u20AC");
- assertFormElementEquals("eur", "€");
}
public void testDollar() {
@@ -35,12 +34,9 @@
public void testYen() {
assertFormElementEquals("yen", "\u00A5");
- assertFormElementEquals("yen", "¥");
}
public void testPound() {
assertFormElementEquals("gbp", "\u00A3");
- assertFormElementEquals("gbp", "£");
}
-
}
\ No newline at end of file
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java
2006-06-20 09:39:00 UTC (rev 485)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java
2006-06-21 08:09:37 UTC (rev 486)
@@ -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 eyes",1,2);
+ cells[0][2]=new Cell("Red\neyes",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 eyes",1,2);
+ cells[0][2]=new Cell("Red\neyes",1,2);
cells[1] = new Cell[2];
cells[1][0]=new Cell("height",1,1);
cells[1][1]=new Cell("weight",1,1);
@@ -59,6 +59,7 @@
cells[2][2]=new Cell("0.003",1,1);
cells[2][3]=new Cell("40%",1,1);
Table table = new Table(cells);
+ assertPass("assertTableRowsEqual", new Object[]{"myTable", new
Integer(0), table});
assertFail("assertTableEquals", new Object[]{"myTable", table});
}
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
2006-06-20 09:39:00 UTC (rev 485)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
2006-06-21 08:09:37 UTC (rev 486)
@@ -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 eyes",1,2);
+ cells[0][2]=new Cell("Red\neyes",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 eyes",1,2);
+ cells[0][2]=new Cell("Red\neyes",1,2);
cells[1] = new Cell[2];
cells[1][0]=new Cell("height",1,1);
cells[1][1]=new Cell("weight",1,1);
@@ -59,6 +59,7 @@
cells[2][2]=new Cell("0.003",1,1);
cells[2][3]=new Cell("40%",1,1);
Table table = new Table(cells);
+ assertPass("assertTableRowsEqual", new Object[]{"myTable", new
Integer(0), table});
assertFail("assertTableEquals", new Object[]{"myTable", table});
}
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JWebUnitAPITestCase.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JWebUnitAPITestCase.java
2006-06-20 09:39:00 UTC (rev 485)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JWebUnitAPITestCase.java
2006-06-21 08:09:37 UTC (rev 486)
@@ -24,7 +24,6 @@
public static final String HOST_PATH =
"http://localhost:"+JETTY_PORT+JETTY_URL;
- private static String dialogKey = null;
/**
* @param name
*/
@@ -42,7 +41,6 @@
public void setUp() throws Exception {
super.setUp();
getTestContext().setBaseUrl(HOST_PATH);
- setTestingEngineKey(getDialogKey());
}
public void assertPassFail(String methodName, Object passArg, Object
failArgs) throws Throwable {
@@ -90,20 +88,4 @@
}
}
- /**
- * @return Returns the testingEngineKey.
- */
- public static String getDialogKey() {
- return dialogKey;
- }
-
- /**
- * @param testingEngineKey The testingEngineKey to set.
- */
- public static void setDialogKey(String testingEngineKey) {
- JWebUnitAPITestCase.dialogKey = testingEngineKey;
- }
-
-
-
}
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JavaScriptEventsTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JavaScriptEventsTest.java
2006-06-20 09:39:00 UTC (rev 485)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JavaScriptEventsTest.java
2006-06-21 08:09:37 UTC (rev 486)
@@ -30,15 +30,14 @@
beginAt("FormOnSubmit.html");
submit();
gotoWindow("child");
- assertTextPresent(" on=submit ");
+ assertTextPresent("on=submit");
}
public void testFormOnReset() {
beginAt("FormOnSubmit.html");
reset();
- // seems that onreset is not executed
- //gotoWindow("child");
- //assertTextPresent(" on=reset ");
+ gotoWindow("child");
+ assertTextPresent("on=reset");
}
public void testButtonOnClick() {
@@ -46,7 +45,7 @@
assertButtonPresent("b1");
clickButton("b1");
gotoWindow("child");
- assertTextPresent(" on=click ");
+ assertTextPresent("on=click");
}
@@ -95,7 +94,7 @@
assertTitleEquals("The Title");
selectOption("testSelect", "Value2");
assertTitleEquals("Submitted parameters");
- assertTextPresent(" testSelect=V2 ");
+ assertTextPresent("testSelect=V2");
}
public void testGreenLink() {
Modified:
trunk/jwebunit-commons-tests/src/main/resources/testcases/TableAssertionsTest/TableAssertionsTestPage.html
===================================================================
---
trunk/jwebunit-commons-tests/src/main/resources/testcases/TableAssertionsTest/TableAssertionsTestPage.html
2006-06-20 09:39:00 UTC (rev 485)
+++
trunk/jwebunit-commons-tests/src/main/resources/testcases/TableAssertionsTest/TableAssertionsTestPage.html
2006-06-21 08:09:37 UTC (rev 486)
@@ -7,7 +7,7 @@
<table id="testTable">
<tr><td>table text</td></tr>
<tr><td>table text row 2</td></tr>
- <tr><td>table text row 3</td><td>row 3 col 1</td>
+ <tr><td>table text row 3</td><td>row 3 col 1</td></tr>
<a href="someurl.html">test link</a>
<form>
<input type="text" name="testInputElement"
value="testValue"/>
Modified:
trunk/jwebunit-httpunit-plugin/src/main/java/net/sourceforge/jwebunit/httpunit/HttpUnitDialog.java
===================================================================
---
trunk/jwebunit-httpunit-plugin/src/main/java/net/sourceforge/jwebunit/httpunit/HttpUnitDialog.java
2006-06-20 09:39:00 UTC (rev 485)
+++
trunk/jwebunit-httpunit-plugin/src/main/java/net/sourceforge/jwebunit/httpunit/HttpUnitDialog.java
2006-06-21 08:09:37 UTC (rev 486)
@@ -1565,9 +1565,7 @@
for (int i = 0; i < httpTable.getRowCount(); i++) {
Row newRow = new Row();
TableRow row = rows[i];
- //TODO Wait until getCells become public in HttpUnit
- //TableCell[] cells = row.getCells();
- TableCell[] cells = new TableCell[0];
+ TableCell[] cells = row.getCells();
for (int j = 0; j < cells.length; j++) {
TableCell httpCell = cells[j];
if (httpCell!=null) newRow.appendCell(new
Cell(httpCell.getText(), httpCell
@@ -1579,7 +1577,7 @@
}
public boolean hasElement(String anID) {
- return getElement(anID) != null;
+ return hasElementByXPath("//[EMAIL PROTECTED]'"+anID+"']");
}
public boolean hasElementByXPath(String xpath) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Jwebunit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
