Update of /cvsroot/jwebunit/jWebUnit/test/net/sourceforge/jwebunit
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11168/test/net/sourceforge/jwebunit

Modified Files:
        JavaScriptEventsTest.java 
Log Message:
Converted javascript test to use jetty. Still has test failures.

Index: JavaScriptEventsTest.java
===================================================================
RCS file: 
/cvsroot/jwebunit/jWebUnit/test/net/sourceforge/jwebunit/JavaScriptEventsTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JavaScriptEventsTest.java   28 Jun 2004 23:24:38 -0000      1.10
--- JavaScriptEventsTest.java   26 Dec 2005 11:47:25 -0000      1.11
***************
*** 5,8 ****
--- 5,12 ----
  package net.sourceforge.jwebunit;
  
+ import junit.framework.Test;
+ import junit.framework.TestSuite;
+ import net.sourceforge.jwebunit.util.JettySetup;
+ 
  import com.meterware.httpunit.HttpUnitOptions;
  
***************
*** 13,38 ****
   */
  
! public class JavaScriptEventsTest  extends JWebUnitTest {
  
      public void testFormOnSubmit() {
-         defineWebPage("TargetPage", "Target");
-         defineWebPage("FormOnSubmit",
-                 "<form method=GET action=\"\" " +
-                     "onSubmit=\"javascript:window.open('TargetPage.html', 
'child');\">" +
-                 "<input type=\"submit\"/>" +
-                 "</form>");
          beginAt("FormOnSubmit.html");
          submit();
          gotoWindow("child");
!         assertTextPresent("Target");
      }
  
      public void testFormOnReset() {
-         defineWebPage("TargetPage", "Target");
-         defineWebPage("FormOnSubmit",
-                 "<form method=GET action=\"\" " +
-                     "onReset=\"javascript:window.open('TargetPage.html', 
'child');\">" +
-                 "<input type=\"reset\"/>" +
-                 "</form>");
          beginAt("FormOnSubmit.html");
          reset();
--- 17,40 ----
   */
  
! public class JavaScriptEventsTest  extends JWebUnitAPITestCase {
  
+     public static Test suite() {
+         Test suite = new TestSuite(JavaScriptEventsTest.class);
+         return new JettySetup(suite);
+     }   
+     
+     public void setUp() throws Exception {
+         super.setUp();
+         getTestContext().setBaseUrl(HOST_PATH + "/JavaScriptEventsTest");
+     }
+     
      public void testFormOnSubmit() {
          beginAt("FormOnSubmit.html");
          submit();
          gotoWindow("child");
!         assertTextPresent("Submitted parameters");
      }
  
      public void testFormOnReset() {
          beginAt("FormOnSubmit.html");
          reset();
***************
*** 42,51 ****
  
      public void testButtonOnClick() {
-         defineWebPage("TargetPage", "Target");
-         defineWebPage("FormOnSubmit",
-                 "<form method=GET action=\"\" " +
-                     "onReset=\"javascript:window.open('TargetPage.html', 
'child');\">" +
-                 "<input id=\"b1\" type=\"button\" value=\"click me\" 
onClick=\"javascript:window.open('TargetPage.html', 'child');\"/>" +
-                 "</form>");
          beginAt("FormOnSubmit.html");
          clickButton("b1");
--- 44,47 ----
***************
*** 54,71 ****
      }
  
      public void testJavaScriptInFile() {
-         defineResource("nav.js", "function gotoNext() { 
window.location='next.html'; return true; }");
-         defineResource("index.html", "<html> <head>" +
-                                            "<script src=\"nav.js\" 
type=\"text/javascript\" language=\"javascript\"></script>" +
-                                      "</head> <body>" +
-                                            "<h1>Javascript Test</h1>" +
-                                      "<form><input type=\"button\" 
onclick=\"gotoNext()\" value=\"Next\" id=\"next\"></form>" +
-                                      "</body></html>");
-         defineResource("next.html", "<html><head>" +
-                                     "<script src=\"nav.js\" 
type=\"text/javascript\" language=\"javascript\"></script>" +
-                                     "</head><body><h1>Next</h1><p>Here is the 
text we expect</p></body></html>");
          beginAt("index.html");
          clickButton("next");
          assertTextPresent("Here is the text we expect");
          beginAt("index.html");
          //commented out for now due to HttpUnit bug; submit does not trigger 
onClick, but clickButton of a
--- 50,60 ----
      }
  
+ 
      public void testJavaScriptInFile() {
          beginAt("index.html");
+         assertTitleEquals("Startpage");
          clickButton("next");
          assertTextPresent("Here is the text we expect");
+         
          beginAt("index.html");
          //commented out for now due to HttpUnit bug; submit does not trigger 
onClick, but clickButton of a
***************
*** 75,129 ****
  //        assertTextPresent("Here is the text we expect");
      }
! 
      public void testLinkAssertsWorkJavascriptDisabled() {
-         defineResource("foobar.js", "function sayWoo() { return true; }");
-         defineResource("test.html", "<html><head>" +
-                                     "<SCRIPT language=\"JavaScript\" 
src=\"/foobar.js\"></script></head>" +
-                                     "<body><a href=\"foo1.html\">foo1</a><a 
href=\"foo1.html\">foo2</a></body></html> ");
          HttpUnitOptions.setScriptingEnabled(false);
!         beginAt("test.html");
!         assertLinkPresentWithText("foo1");
!         assertLinkPresentWithText("foo2");
          HttpUnitOptions.setScriptingEnabled(true);
-     }
  
!       public void testEmbeddedJSFile()
!       {
!         defineResource("script.js", "function gotoNext() { 
window.location='next.html'; return true; }");
!               defineResource("script.html", "<html><script 
src=\"script.js\"></script>" +
!                                       "<title>The Title</title></html>" );
! 
!               beginAt("script.html");
!               assertTitleEquals("The Title");
!       }
  
        public void testLinkClickSetsWindowLocation()
        {
!         defineResource("script.js", "function gotoNext() { 
window.location='next.html';}");
!               defineResource("script.html", "<html><script 
src=\"script.js\"></script>" +
!                                       "<title>The Title</title><body><a 
href=\"javascript:gotoNext()\">link</a></body></html>" );
!               defineResource("next.html", "<html><title>Next 
Page</title></html>" );
!               
!               beginAt("script.html");
!               assertTitleEquals("The Title");
!               clickLinkWithText("link");
!               assertTitleEquals("Next Page");
        }
!       
        public void testOnChangeSetsWindowLocation() throws Exception {
!               defineResource("test.html", "<html><script>function 
changeSelect() {document.forms[0].submit();}</script>" +
!                       "<title>The Title</title><body>" +
!                       "<form name=\"testForm\" action=\"next.html\" 
method=\"get\">" + 
!                       "<select type=\"select\" name=\"testSelect\" 
onchange=\"changeSelect();\">" +
!                       "<option value=\"V1\" 
selected=\"true\">Value1</option>" +
!                       "<option value=\"V2\">Value2</option>" +
!                       "</select></form></body></html>");
!               defineResource("next.html?testSelect=V1", "<html><title>Next 
Page Value1</title></html>" );
!               defineResource("next.html?testSelect=V2", "<html><title>Next 
Page Value2</title></html>" );
!               beginAt("test.html");
                assertTitleEquals("The Title");
                selectOption("testSelect", "Value2");
! //            System.out.println("After Selection in Client:\n" + 
getDialog().getWebClient().getCurrentPage().getText());
!               assertTitleEquals("Next Page Value2");
        }
  
--- 64,103 ----
  //        assertTextPresent("Here is the text we expect");
      }
!  
      public void testLinkAssertsWorkJavascriptDisabled() {
          HttpUnitOptions.setScriptingEnabled(false);
!         beginAt("index.html");
!         clickLink("linkNext");
!         assertTitleEquals("Startpage");
!         assertTextNotPresent("Here is the text we expect");
          HttpUnitOptions.setScriptingEnabled(true);
  
!         HttpUnitOptions.setScriptingEnabled(false);
!         beginAt("index.html");
!         clickButton("next");
!         assertTitleEquals("Startpage");
!         assertTextNotPresent("Here is the text we expect");
!         HttpUnitOptions.setScriptingEnabled(true);
!         
!         // and test that javascript is enabled for the next begin
!         beginAt("index.html");
!         clickLink("linkNext");
!         assertTitleEquals("Next page");
!     }
  
        public void testLinkClickSetsWindowLocation()
        {
!               beginAt("index.html");
!               assertTitleEquals("Startpage");
!               clickLinkWithText("Next");
!               assertTitleEquals("Next page");
        }
!     
        public void testOnChangeSetsWindowLocation() throws Exception {
!               beginAt("onchange.html");
                assertTitleEquals("The Title");
                selectOption("testSelect", "Value2");
!               assertTitleEquals("Submitted parameters");
!         assertTextPresent(" testSelect=V2 ");
        }
  



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Jwebunit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development

Reply via email to