Thread: [JWebUnit-development] SF.net SVN: jwebunit:[779] trunk (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 779
          http://jwebunit.svn.sourceforge.net/jwebunit/?rev=779&view=rev
Author:   jevonwright
Date:     2008-12-08 00:57:17 +0000 (Mon, 08 Dec 2008)

Log Message:
-----------
cleaning up ResponseServletTest and documentation

Modified Paths:
--------------
    trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ResponseServletTest.java
    trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
    trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
    trunk/src/site/xdoc/index.xml

Modified: trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ResponseServletTest.java
===================================================================

--- trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ResponseServletTest.java	2008-12-07 22:45:13 UTC (rev 778)
+++ trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ResponseServletTest.java	2008-12-08 00:57:17 UTC (rev 779)
@@ -80,24 +80,23 @@
      * Issue 1674646: add support for specifying the timeout of pages
      */
     public void testTimeout() {
-        //Test that timeout was fired
     	
+        // test that timeout was fired
     	setTimeout(500);			// specify a global timeout of 0.5 seconds (must be set before the WebConnection is initialised)
         beginAt("/SimpleForm.html");
         assertTitleEquals("response form");
         setTextField("timeout", "1");		// server wait for 1 seconds
-        boolean ok = false;
         try {
         	submit();
+        	fail("timeout was not called");	// we should not get here
         } catch (RuntimeException e) {
         	assertTrue("timeout caused by SocketTimeoutException, but was " + e.getCause().getClass(), e.getCause() instanceof SocketTimeoutException);
-        	ok = true;
         }
-        assertTrue("Timeout wasn't fired", ok);
+        
+        // close and reset the browser
         closeBrowser();
         
-        //Test that timeout wasn't fired 
-        
+        // test that timeout wasn't fired 
         setTimeout(2000);			// specify a global timeout of 2 seconds (must be set before the WebConnection is initialised)
         beginAt("/SimpleForm.html");
         assertTitleEquals("response form");

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-12-07 22:45:13 UTC (rev 778)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java	2008-12-08 00:57:17 UTC (rev 779)
@@ -3342,11 +3342,11 @@
      * Set the timeout for the request. A timeout of 0 means
      * an infinite timeout.
      * 
-     * @param seconds the seconds in which to timeout, or 0 for infinite
+     * @param milli the milliseconds in which to timeout, or 0 for infinite
      * wait (the default).
      */
-    public void setTimeout(int seconds) {
-    	getTestingEngine().setTimeout(seconds);
+    public void setTimeout(int milli) {
+    	getTestingEngine().setTimeout(milli);
     }
 
     private Image validateImage(String imageSrc, String imageAlt, File out) {

Modified: trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
===================================================================
--- trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java	2008-12-07 22:45:13 UTC (rev 778)
+++ trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java	2008-12-08 00:57:17 UTC (rev 779)
@@ -181,6 +181,7 @@
             ExpectedJavascriptConfirmException,
             ExpectedJavascriptPromptException {
         wc = null;
+        form = null;		// reset current form
         if (this.expectedJavascriptAlerts.size() > 0) {
             throw new ExpectedJavascriptAlertException(
                     ((JavascriptAlert) (expectedJavascriptAlerts.get(0)))

Modified: trunk/src/site/xdoc/index.xml
===================================================================
--- trunk/src/site/xdoc/index.xml	2008-12-07 22:45:13 UTC (rev 778)
+++ trunk/src/site/xdoc/index.xml	2008-12-08 00:57:17 UTC (rev 779)
@@ -48,7 +48,6 @@
 		<source>
 public class ExampleWebTestCase extends WebTestCase {
 	public ExampleWebTestCase(String name) {
-		super(name);
 		getTestContext().setBaseUrl("http://localhost:8080/test");
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [JWebUnit-development] SF.net SVN: jwebunit:[779] trunk (Page 2)

jwebunit-development