geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r654690 [2/2] - in /geronimo/server/trunk: testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ testsuite/deployment...
Date Fri, 09 May 2008 06:16:48 GMT
Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
Thu May  8 23:16:46 2008
@@ -29,7 +29,7 @@
     @Test
     public void testDeferral() throws Exception {
         selenium.open("/jsp21/testDeferral.jsp");
-        selenium.waitForPageToLoad("30000");
+        waitForPageLoad();
         
         //throw new Exception(selenium.getText("xpath=/html/body"));
         assertEquals("OneTwo", selenium.getText("xpath=/html/body"));
@@ -38,21 +38,21 @@
     @Test
     public void testScopes() throws Exception {
         selenium.open("/jsp21/testScopes.jsp");
-        selenium.waitForPageToLoad("30000");
+        waitForPageLoad();
         assertEquals("value1 value2 value3 value4", selenium.getText("xpath=/html/body"));
     }
 
     @Test
     public void testTaglibs() throws Exception {
         selenium.open("/jsp21/testTaglibs.jsp");
-        selenium.waitForPageToLoad("30000");
+        waitForPageLoad();
         assertEquals("Hello", selenium.getText("xpath=/html/body"));
     }
 
     @Test
     public void testTrimWhitespace() throws Exception {
         selenium.open("/jsp21/testTrimWhitespace.jsp");
-        selenium.waitForPageToLoad("30000");
+        waitForPageLoad();
         assertEquals("source html of this page should not contain empty lines", selenium.getText("xpath=/html/body"));
     }
 

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java
Thu May  8 23:16:46 2008
@@ -28,7 +28,7 @@
     @Test
     public void testIndexContent() throws Exception {
         selenium.open("/servlet25/SampleServlet");
-        selenium.waitForPageToLoad("30000");
+        waitForPageLoad();
         assertEquals("Sample application with Servlets 2.5", selenium.getTitle());
         assertEquals("Welcome to Servlets 2.5 samples. Sample Servlet!", selenium.getText("xpath=/html/body"));
     }
@@ -37,7 +37,7 @@
     @Test
     public void testIndexContent2() throws Exception {
         selenium.open("/servlet25/SampleServlet2");
-        selenium.waitForPageToLoad("30000");
+        waitForPageLoad();
         assertEquals("Sample application with Servlets 2.5", selenium.getTitle());
         assertEquals("Welcome to Servlets 2.5 samples. Another Sample Servlet!", selenium.getText("xpath=/html/body"));
 

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
Thu May  8 23:16:46 2008
@@ -29,7 +29,7 @@
     @Test
     public void testManagedBean() throws Exception {
         selenium.open("/myfaces");
-        selenium.waitForPageToLoad("30000");
+        waitForPageLoad();
         assertEquals("0.99 Please enter your nameHelloUpdate greeting", selenium.getBodyText());
     }
     

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java
Thu May  8 23:16:46 2008
@@ -28,17 +28,17 @@
     @Test
     public void testServletForward() throws Exception {
         selenium.open("/dispatch1/TestServlet");
-        selenium.waitForPageToLoad("30000");
+        waitForPageLoad();
         System.out.println(selenium.getBodyText());
         assertTrue("Servlet1", selenium.isTextPresent("TestServlet1: 10"));
 
         selenium.open("/dispatch2/TestServlet");
-        selenium.waitForPageToLoad("30000");
+        waitForPageLoad();
         System.out.println(selenium.getBodyText());
         assertTrue("Servlet2", selenium.isTextPresent("TestServlet2: 20"));
 
         selenium.open("/dispatch2/TestServlet?mode=forward");
-        selenium.waitForPageToLoad("30000");
+        waitForPageLoad();
         System.out.println(selenium.getBodyText());
         assertTrue("Servlet2->Servlet1 forward", selenium.isTextPresent("TestServlet1:
10"));
         

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java
Thu May  8 23:16:46 2008
@@ -34,7 +34,7 @@
     @Test
     public void testWebReferences() throws Exception {
         selenium.open("/webref/TomcatTestServlet");
-        selenium.waitForPageToLoad("30000");
+        waitForPageLoad();
         assertEquals("Sample application to check references", selenium.getTitle());
         System.out.println(selenium.getText("xpath=/html/body/font"));
         assertEquals("Check EJB Reference : Call to bean method returned ->bean Test",
selenium.getText("xpath=/html/body/font"));

Modified: geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java
(original)
+++ geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java
Thu May  8 23:16:46 2008
@@ -76,7 +76,7 @@
         selenium.stop();
     }
     
-    protected void waitForLoad() throws Exception {
+    protected void waitForPageLoad() throws Exception {
         ensureSeleniumClientInitialized();
         
         selenium.waitForPageToLoad("30000");



Mime
View raw message