svn commit: r1156704 - in /tapestry/tapestry5/trunk/tapestry-test: ./ src/main/java/org/apache/tapestry5/test/ src/test/java/org/apache/tapestry5/test/

[hlship]

Author: hlship
Date: Thu Aug 11 17:51:22 2011
New Revision: 1156704

URL: http://svn.apache.org/viewvc?rev=1156704&view=rev
Log:
TAP5-1599: Commit patch to move to Selenium 2.3.1 (note: some test failures)

Modified:
    tapestry/tapestry5/trunk/tapestry-test/build.gradle
    
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
    
tapestry/tapestry5/trunk/tapestry-test/src/test/java/org/apache/tapestry5/test/SanityCheckTestSuite.java

Modified: tapestry/tapestry5/trunk/tapestry-test/build.gradle
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/build.gradle?rev=1156704&r1=1156703&r2=1156704&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/build.gradle (original)
+++ tapestry/tapestry5/trunk/tapestry-test/build.gradle Thu Aug 11 17:51:22 2011
@@ -1,7 +1,8 @@
 description = "Utilities for unit and integration testing of Tapestry 
applications"
 
 dependencies {
-  compile "org.seleniumhq.selenium.server:selenium-server:1.0.3:standalone@jar"
+  compile "org.seleniumhq.selenium:selenium-java:2.3.1"
+  compile "org.seleniumhq.selenium:selenium-server:2.3.1"
   compile "jetty:org.mortbay.jetty:5.1.12"
     
   compile "org.testng:testng:$testngVersion"
@@ -17,4 +18,4 @@ dependencies {
   compile "org.apache.tomcat:dbcp:$tomcatVersion"
 
   compile "org.easymock:easymock:$easymockVersion"
-}
\ No newline at end of file
+}

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=1156704&r1=1156703&r2=1156704&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
 Thu Aug 11 17:51:22 2011
@@ -1196,4 +1196,8 @@ public class AbstractIntegrationTestSuit
     {
         selenium.open(url, ignoreResponseCode);
     }
+
+    public Number getCssCount(String str) {
+        return selenium.getCssCount(str);
+    }
 }

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=1156704&r1=1156703&r2=1156704&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
 Thu Aug 11 17:51:22 2011
@@ -1397,4 +1397,8 @@ public abstract class SeleniumTestCase e
     {
         
waitForCondition("selenium.browserbot.getCurrentWindow().Ajax.activeRequestCount
 == 0", timeout);
     }
+
+    public Number getCssCount(String str) {
+        return selenium.getCssCount(str);
+    }
 }

Modified: 
tapestry/tapestry5/trunk/tapestry-test/src/test/java/org/apache/tapestry5/test/SanityCheckTestSuite.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/test/java/org/apache/tapestry5/test/SanityCheckTestSuite.java?rev=1156704&r1=1156703&r2=1156704&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-test/src/test/java/org/apache/tapestry5/test/SanityCheckTestSuite.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-test/src/test/java/org/apache/tapestry5/test/SanityCheckTestSuite.java
 Thu Aug 11 17:51:22 2011
@@ -48,4 +48,8 @@ public class SanityCheckTestSuite extend
     {
         
assertNotNull(context.getAttribute(TapestryTestConstants.COMMAND_PROCESSOR_ATTRIBUTE));
     }
+
+    public Number getCssCount(String str) {
+        return selenium.getCssCount(str);
+    }
 }