Revision: 552
Author: solsson
Date: 2006-08-02 02:07:05 -0700 (Wed, 02 Aug 2006)
ViewCVS: http://svn.sourceforge.net/jwebunit/?rev=552&view=rev
Log Message:
-----------
Made minimal changes to make the sources compile. TableFixture is
non-functional because I did not find the way to retreive table contents in the
new API (there is only assertions for the Table class).
Had to use the deprecated getDialog() in WebTester, because jWebFit was not
designed to use only assertions.
Modified Paths:
--------------
trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/OptionDisplay.java
trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/TableFixture.java
trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/WebFixture.java
trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/reflect/MethodInvoker.java
Added Paths:
-----------
trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/reflect/
Modified:
trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/OptionDisplay.java
===================================================================
--- trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/OptionDisplay.java
2006-08-02 08:34:20 UTC (rev 551)
+++ trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/OptionDisplay.java
2006-08-02 09:07:05 UTC (rev 552)
@@ -22,8 +22,11 @@
}
public Object[] query() throws Exception {
- String[] labels =
WebFixture.tester.getDialog().getOptionsFor(selectName);
- String[] values =
WebFixture.tester.getDialog().getOptionValuesFor(selectName);
+ String[] values =
WebFixture.tester.getDialog().getSelectOptionValues(selectName);
+ String[] labels = new String[values.length];
+ for (int i = 0; i < values.length; i++) {
+ labels[i] =
WebFixture.tester.getDialog().getSelectOptionLabelForValue(selectName,
values[i]);
+ }
return Option.buildOptions(labels, values);
}
Modified:
trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/TableFixture.java
===================================================================
--- trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/TableFixture.java
2006-08-02 08:34:20 UTC (rev 551)
+++ trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/TableFixture.java
2006-08-02 09:07:05 UTC (rev 552)
@@ -5,6 +5,8 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import net.sourceforge.jwebunit.html.Table;
+
/**
* Fixture to validate data in Html tables. To test a given table, a concrete
subclass
* of this fixture as well as a concrete subclass of a TableRow must be
provided.
@@ -17,17 +19,21 @@
protected abstract String getSourceTableSummaryOrId();
public Object[] query() throws Exception {
- String [][] sparseTable =
WebFixture.tester.getDialog().getSparseTableBySummaryOrId(getSourceTableSummaryOrId());
- TableRow [] rowObjects = new TableRow[sparseTable.length -
getDataStartRow()];
+ Table sparseTable =
WebFixture.tester.getDialog().getTable(getSourceTableSummaryOrId());
+ TableRow [] rowObjects = new TableRow[sparseTable.getRowCount() -
getDataStartRow()];
int index = 0;
- for (int i = getDataStartRow(); i < sparseTable.length; i++) {
- rowObjects[index] = buildTableRow(sparseTable[i]);
+ for (int i = getDataStartRow(); i < sparseTable.getRowCount(); i++) {
+ rowObjects[index] = buildTableRow(getRowAsStringArray(sparseTable,
i));
index ++;
}
return rowObjects;
}
- /**
+ private String[] getRowAsStringArray(Table sparseTable, int rowNumber) {
+ throw new UnsupportedOperationException("sparseTable[i] from
the old JWebUnit API has not been converted to use the new Table class");
+ }
+
+ /**
* This is zero based
* @return
*/
Modified:
trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/WebFixture.java
===================================================================
--- trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/WebFixture.java
2006-08-02 08:34:20 UTC (rev 551)
+++ trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/WebFixture.java
2006-08-02 09:07:05 UTC (rev 552)
@@ -7,9 +7,9 @@
import junit.framework.AssertionFailedError;
import net.sourceforge.jwebunit.WebTester;
-import net.sourceforge.jwebunit.util.reflect.MethodInvoker;
+import net.sourceforge.jwebunit.fit.reflect.MethodInvoker;
-import com.meterware.httpunit.cookies.CookieProperties;
+//import com.meterware.httpunit.cookies.CookieProperties;
import fit.ActionFixture;
import fit.Parse;
@@ -55,16 +55,19 @@
}
public void setExceptionsThrownOnScriptError(boolean flag) {
-
com.meterware.httpunit.HttpUnitOptions.setExceptionsThrownOnScriptError(flag);
+ throw new UnsupportedOperationException("This method had a
HttpUnit-specific implementation");
+
//com.meterware.httpunit.HttpUnitOptions.setExceptionsThrownOnScriptError(flag);
}
public void setLoggingHttpHeaders(boolean flag) {
- com.meterware.httpunit.HttpUnitOptions.setLoggingHttpHeaders(flag);
+ throw new UnsupportedOperationException("This method had a
HttpUnit-specific implementation");
+ //com.meterware.httpunit.HttpUnitOptions.setLoggingHttpHeaders(flag);
}
public void setCookieMatchingStrict(boolean flag) {
- CookieProperties.setDomainMatchingStrict(flag);
- CookieProperties.setPathMatchingStrict(flag);
+ throw new UnsupportedOperationException("This method had a
HttpUnit-specific implementation");
+ //CookieProperties.setDomainMatchingStrict(flag);
+ //CookieProperties.setPathMatchingStrict(flag);
}
// Actions
@@ -102,10 +105,10 @@
public void window() {
String windowIdOrTitle = cells.more.text();
- if (tester.getDialog().getWindow(windowIdOrTitle) != null) {
- tester.gotoWindow(cells.more.text());
+ if (tester.getDialog().hasWindowByTitle(windowIdOrTitle)) {
+ tester.gotoWindowByTitle(cells.more.text());
} else {
- tester.gotoWindowByTitle(cells.more.text());
+ tester.gotoWindow(cells.more.text());
}
}
@@ -136,6 +139,8 @@
tester.selectOption(
cells.more.more.text(),
cells.more.more.more.text());
+ /*
+ * This type of checkbox handling is not supported in jwebunit 1.3:
} else if (cells.more.text().equals("checkbox after")) {
// checkbox or radio button appearing after the text label given
in next cell
tester.checkCheckboxWithLabel(
@@ -144,6 +149,7 @@
// checkbox or radio button appearing before the text label given
in next cell
tester.checkCheckboxBeforeLabel(
cells.more.more.text());
+ */
} else {
exception(
cells.more,
@@ -286,7 +292,7 @@
public void dumpResponse() {
System.err.println("***************begin page***********************");
- tester.dumpResponse(System.err);
+ tester.dumpHtml(System.err);
System.err.println("***************end page*************************");
}
Copied: trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/reflect (from
rev 400, trunk/jWebUnit/src/main/java/net/sourceforge/jwebunit/util/reflect)
Modified:
trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/reflect/MethodInvoker.java
===================================================================
---
trunk/jWebUnit/src/main/java/net/sourceforge/jwebunit/util/reflect/MethodInvoker.java
2006-04-24 13:45:15 UTC (rev 400)
+++
trunk/jwebfit/src/main/java/net/sourceforge/jwebunit/fit/reflect/MethodInvoker.java
2006-08-02 09:07:05 UTC (rev 552)
@@ -2,7 +2,7 @@
* Copyright (c) 2001, ThoughtWorks, Inc.
* Distributed open-source, see full license under
licenses/jwebunit_license.txt
**********************************/
-package net.sourceforge.jwebunit.util.reflect;
+package net.sourceforge.jwebunit.fit.reflect;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Jwebunit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
