You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2009/01/14 20:26:28 UTC
svn commit: r734488 - in /tapestry/tapestry5/trunk: ./ tapestry-test/
tapestry-test/src/main/java/org/apache/tapestry5/test/
Author: hlship
Date: Wed Jan 14 11:26:28 2009
New Revision: 734488
URL: http://svn.apache.org/viewvc?rev=734488&view=rev
Log:
TAP5-541: Upgrade Selenium dependencies to new beta (which supports FireFox 3)
Modified:
tapestry/tapestry5/trunk/pom.xml
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/ErrorReportingCommandProcessor.java
Modified: tapestry/tapestry5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/pom.xml?rev=734488&r1=734487&r2=734488&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/pom.xml (original)
+++ tapestry/tapestry5/trunk/pom.xml Wed Jan 14 11:26:28 2009
@@ -339,14 +339,14 @@
<distributionManagement>
<repository>
<id>tapestry</id>
- <url>file:/var/www/html/maven-repository</url>
+ <url>file:/var/www/maven-repository</url>
</repository>
<snapshotRepository>
<id>tapestry-snapshot</id>
- <url>file:/var/www/html/maven-snapshot-repository</url>
+ <url>file:/var/www/maven-snapshot-repository</url>
</snapshotRepository>
<site>
- <url>file:/var/www/html/nightly/tapestry5</url>
+ <url>file:/var/www/nightly/tapestry5</url>
</site>
</distributionManagement>
</profile>
Modified: tapestry/tapestry5/trunk/tapestry-test/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/pom.xml?rev=734488&r1=734487&r2=734488&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-test/pom.xml Wed Jan 14 11:26:28 2009
@@ -15,21 +15,21 @@
<dependencies>
<dependency>
- <groupId>org.openqa.selenium.client-drivers</groupId>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
- <version>1.0-beta-1</version>
+ <version>1.0-beta-2</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.openqa.selenium.server</groupId>
+ <groupId>org.seleniumhq.selenium.server</groupId>
<artifactId>selenium-server</artifactId>
- <version>1.0-beta-1</version>
+ <version>1.0-beta-2</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.openqa.selenium.server</groupId>
+ <groupId>org.seleniumhq.selenium.server</groupId>
<artifactId>selenium-server-coreless</artifactId>
- <version>1.0-beta-1</version>
+ <version>1.0-beta-2</version>
<scope>compile</scope>
</dependency>
<dependency>
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=734488&r1=734487&r2=734488&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 Wed Jan 14 11:26:28 2009
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008 The Apache Software Foundation
+// Copyright 2007, 2008, 2009 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
import com.thoughtworks.selenium.DefaultSelenium;
import com.thoughtworks.selenium.HttpCommandProcessor;
import com.thoughtworks.selenium.Selenium;
+import org.openqa.selenium.server.RemoteControlConfiguration;
import org.openqa.selenium.server.SeleniumServer;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
@@ -264,7 +265,7 @@
server.start();
- CommandProcessor cp = new HttpCommandProcessor("localhost", SeleniumServer.DEFAULT_PORT,
+ CommandProcessor cp = new HttpCommandProcessor("localhost", RemoteControlConfiguration.DEFAULT_PORT,
seleniumBrowserCommand, BASE_URL);
selenium = new DefaultSelenium(new ErrorReportingCommandProcessor(cp));
@@ -900,11 +901,6 @@
selenium.addLocationStrategy(strategyName, functionDefinition);
}
- public void captureEntirePageScreenshot(String filename)
- {
- selenium.captureEntirePageScreenshot(filename);
- }
-
public void setContext(String context)
{
selenium.setContext(context);
@@ -942,6 +938,9 @@
/**
* Used to start a typical test, by opening to the base URL and clicking through a series of links.
+ * <p/>
+ * Note: Selenium 1.0-beta-2 has introduced a method start(String) which is distinct from this implementation (which
+ * dates back to Tapestry 5.0 and Selenium 1.0-beta-1).
*/
protected final void start(String... linkText)
{
@@ -960,4 +959,144 @@
{
this.webappRoot = webappRoot;
}
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void setExtensionJs(String extensionJs)
+ {
+ selenium.setExtensionJs(extensionJs);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void start(Object optionsObject)
+ {
+ selenium.start(optionsObject);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void showContextualBanner()
+ {
+ selenium.showContextualBanner();
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void showContextualBanner(String className, String methodName)
+ {
+ selenium.showContextualBanner(className, methodName);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void mouseDownRight(String locator)
+ {
+ selenium.mouseDownRight(locator);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void mouseDownRightAt(String locator, String coordString)
+ {
+ selenium.mouseDownRightAt(locator, coordString);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void captureEntirePageScreenshot(String filename, String kwargs)
+ {
+ selenium.captureEntirePageScreenshot(filename, kwargs);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void rollup(String rollupName, String kwargs)
+ {
+ selenium.rollup(rollupName, kwargs);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void addScript(String scriptContent, String scriptTagId)
+ {
+ selenium.addScript(scriptContent, scriptTagId);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void removeScript(String scriptTagId)
+ {
+ selenium.removeScript(scriptTagId);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void useXpathLibrary(String libraryName)
+ {
+ selenium.useXpathLibrary(libraryName);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public String captureScreenshotToString()
+ {
+ return selenium.captureScreenshotToString();
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public String captureEntirePageScreenshotToString(String kwargs)
+ {
+ return selenium.captureEntirePageScreenshotToString(kwargs);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public String retrieveLastRemoteControlLogs()
+ {
+ return selenium.retrieveLastRemoteControlLogs();
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void mouseUpRight(String locator)
+ {
+ selenium.mouseUpRight(locator);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void mouseUpRightAt(String locator, String coordString)
+ {
+ selenium.mouseUpRightAt(locator, coordString);
+ }
+
+ /**
+ * This does NOT invoke {@link com.thoughtworks.selenium.Selenium#start(String)}; it invokes {@link
+ * #start(String[])}. This is necesasry due to the introduction of the start() method.
+ *
+ * @param linkText text of link to click
+ * @since 5.1.0.0
+ */
+ public void start(String linkText)
+ {
+ start(new String[] { linkText });
+ }
}
Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java?rev=734488&r1=734487&r2=734488&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java Wed Jan 14 11:26:28 2009
@@ -1,4 +1,4 @@
-// Copyright 2007 The Apache Software Foundation
+// Copyright 2007, 2009 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -161,4 +161,35 @@
delegate.stop();
}
+ /**
+ * @since 5.1.0.0
+ */
+ public String getRemoteControlServerLocation()
+ {
+ return delegate.getRemoteControlServerLocation();
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void setExtensionJs(String extensionJs)
+ {
+ delegate.setExtensionJs(extensionJs);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void start(String optionsString)
+ {
+ delegate.start(optionsString);
+ }
+
+ /**
+ * @since 5.1.0.0
+ */
+ public void start(Object optionsObject)
+ {
+ delegate.start(optionsObject);
+ }
}