tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject svn commit: r917515 - in /tapestry/tapestry5/trunk: tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ tapestry-test/ tapestry-test/src/main/java/org/apache/tapestry5/test/
Date Mon, 01 Mar 2010 13:23:36 GMT
Author: uli
Date: Mon Mar  1 13:23:36 2010
New Revision: 917515

URL: http://svn.apache.org/viewvc?rev=917515&view=rev
Log:
TAP5-1033: upgrade selenium dependencies to 1.0.3

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
    tapestry/tapestry5/trunk/tapestry-test/pom.xml
    tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
    tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java?rev=917515&r1=917514&r2=917515&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
Mon Mar  1 13:23:36 2010
@@ -568,7 +568,7 @@
     @Test
     public void base_class_must_be_in_controlled_package() throws Exception
     {
-        open(getBaseURL() + "invalidsuperclass");
+        open(getBaseURL() + "invalidsuperclass", "true");
 
         assertTextPresent("Base class org.apache.tapestry5.integration.app1.WrongPackageForBaseClass
(super class of org.apache.tapestry5.integration.app1.pages.InvalidSuperClass) is not in a
controlled package and is therefore not valid. You should try moving the class to package
org.apache.tapestry5.integration.app1.base.");
     }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java?rev=917515&r1=917514&r2=917515&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
Mon Mar  1 13:23:36 2010
@@ -431,7 +431,7 @@
     @Test
     public void form_action_via_get()
     {
-        open(getBaseURL() + "validform.form");
+        open(getBaseURL() + "validform.form", "true");
 
         assertTextPresent("Forms require that the request method be POST and that the t:formdata
query parameter have values.");
     }

Modified: tapestry/tapestry5/trunk/tapestry-test/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/pom.xml?rev=917515&r1=917514&r2=917515&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-test/pom.xml Mon Mar  1 13:23:36 2010
@@ -15,21 +15,10 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.seleniumhq.selenium.client-drivers</groupId>
-      <artifactId>selenium-java-client-driver</artifactId>
-      <version>${selenium-version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.seleniumhq.selenium.server</groupId>
       <artifactId>selenium-server</artifactId>
       <version>${selenium-version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.seleniumhq.selenium.server</groupId>
-      <artifactId>selenium-server-coreless</artifactId>
-      <version>${selenium-version}</version>
+      <classifier>standalone</classifier>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -63,6 +52,12 @@
       <version>${jetty-version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>jetty</groupId>
+      <artifactId>org.mortbay.jetty</artifactId>
+      <version>5.1.12</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -95,7 +90,7 @@
 
 
   <properties>
-    <selenium-version>1.0.1</selenium-version>
+    <selenium-version>1.0.3</selenium-version>
     <jetty-version>7.0.0.v20091005</jetty-version>
   </properties>
 </project>

Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java?rev=917515&r1=917514&r2=917515&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
Mon Mar  1 13:23:36 2010
@@ -516,7 +516,10 @@
 
     public void open(String url)
     {
-        selenium.open(url);
+        // open the URL but ignore the HTTP status code. Necessary if we want to check
+        // for certain contents on error pages. The behaviour changed in Selenium 1.0.2.
+        // Until then the HTTP status code was just ignored.
+        selenium.open(url, "true");
     }
 
     public void openWindow(String url, String windowID)
@@ -1177,4 +1180,20 @@
     {
         selenium.selectPopUp(windowID);
     }
+
+    /**
+     * @since 5.2.0.0
+     */
+    public String getLog()
+    {
+        return selenium.getLog();
+    }
+
+    /**
+     * @since 5.2.0.0
+     */
+    public void open(String url, String ignoreResponseCode)
+    {
+        selenium.open(url, ignoreResponseCode);
+    }
 }

Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java?rev=917515&r1=917514&r2=917515&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
Mon Mar  1 13:23:36 2010
@@ -406,6 +406,11 @@
         return delegate.getLocation();
     }
 
+    public String getLog()
+    {
+        return delegate.getLog();
+    }
+
     public Number getMouseSpeed()
     {
         return delegate.getMouseSpeed();
@@ -675,6 +680,11 @@
     {
         delegate.open(url);
     }
+    
+    public void open(String url, String ignoreResponseCode)
+    {
+        delegate.open(url, ignoreResponseCode);
+    }
 
     public void openWindow(String url, String windowID)
     {
@@ -1020,5 +1030,5 @@
 
             throw ex;
         }
-    }
+    }    
 }



Mime
View raw message