Author: andyhot
Date: Thu Nov 19 14:13:24 2009
New Revision: 882155
URL: http://svn.apache.org/viewvc?rev=882155&view=rev
Log:
TAP5-762: Update selenium in 5.0 branch
Modified:
tapestry/tapestry5/branches/5.0/tapestry-test/pom.xml
tapestry/tapestry5/branches/5.0/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
tapestry/tapestry5/branches/5.0/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
Modified: tapestry/tapestry5/branches/5.0/tapestry-test/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.0/tapestry-test/pom.xml?rev=882155&r1=882154&r2=882155&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.0/tapestry-test/pom.xml (original)
+++ tapestry/tapestry5/branches/5.0/tapestry-test/pom.xml Thu Nov 19 14:13:24
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>${selenium-version}</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>${selenium-version}</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>${selenium-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -68,4 +68,8 @@
</plugin>
</plugins>
</reporting>
+
+ <properties>
+ <selenium-version>1.0.1</selenium-version>
+ </properties>
</project>
Modified:
tapestry/tapestry5/branches/5.0/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.0/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java?rev=882155&r1=882154&r2=882155&view=diff
==============================================================================
---
tapestry/tapestry5/branches/5.0/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
(original)
+++
tapestry/tapestry5/branches/5.0/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
Thu Nov 19 14:13:24 2009
@@ -18,13 +18,15 @@
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;
import org.testng.annotations.BeforeClass;
/**
- * A base class for creating integration tests. Ths encapsulates starting up
an in-process copy of Jetty, and in-process
+ * A base class for creating integration tests. This encapsulates starting up
an in-process copy of Jetty, and in-process
* copy of {...@link SeleniumServer}, and a Selenium client.
* <p/>
* Unless you are <em>very, very clever</em>, you will want to run the tests
sequentially. TestNG tends to run them in
@@ -263,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));
@@ -899,11 +901,6 @@
selenium.addLocationStrategy(strategyName, functionDefinition);
}
- public void captureEntirePageScreenshot(String filename)
- {
- selenium.captureEntirePageScreenshot(filename);
- }
-
public void setContext(String context)
{
selenium.setContext(context);
@@ -948,5 +945,177 @@
for (String s : linkText)
clickAndWait(String.format("link=%s", s));
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void setExtensionJs(String extensionJs)
+ {
+ selenium.setExtensionJs(extensionJs);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void start(Object optionsObject)
+ {
+ selenium.start(optionsObject);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void showContextualBanner()
+ {
+ selenium.showContextualBanner();
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void showContextualBanner(String className, String methodName)
+ {
+ selenium.showContextualBanner(className, methodName);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void mouseDownRight(String locator)
+ {
+ selenium.mouseDownRight(locator);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void mouseDownRightAt(String locator, String coordString)
+ {
+ selenium.mouseDownRightAt(locator, coordString);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void captureEntirePageScreenshot(String filename, String kwargs)
+ {
+ selenium.captureEntirePageScreenshot(filename, kwargs);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ 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.0.19
+ */
+ public void removeScript(String scriptTagId)
+ {
+ selenium.removeScript(scriptTagId);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void useXpathLibrary(String libraryName)
+ {
+ selenium.useXpathLibrary(libraryName);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public String captureScreenshotToString()
+ {
+ return selenium.captureScreenshotToString();
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public String captureEntirePageScreenshotToString(String kwargs)
+ {
+ return selenium.captureEntirePageScreenshotToString(kwargs);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public String retrieveLastRemoteControlLogs()
+ {
+ return selenium.retrieveLastRemoteControlLogs();
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void mouseUpRight(String locator)
+ {
+ selenium.mouseUpRight(locator);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ 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 necessary due to the introduction of the
start() method.
+ *
+ * @param linkText text of link to click
+ * @since 5.0.19
+ */
+ public void start(String linkText)
+ {
+ start(new String[] { linkText });
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void addCustomRequestHeader(String key, String value)
+ {
+ selenium.addCustomRequestHeader(key, value);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public String captureNetworkTraffic(String type)
+ {
+ return selenium.captureNetworkTraffic(type);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void deselectPopUp()
+ {
+ selenium.deselectPopUp();
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void selectPopUp(String windowID)
+ {
+ selenium.selectPopUp(windowID);
+ }
}
Modified:
tapestry/tapestry5/branches/5.0/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.0/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java?rev=882155&r1=882154&r2=882155&view=diff
==============================================================================
---
tapestry/tapestry5/branches/5.0/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
(original)
+++
tapestry/tapestry5/branches/5.0/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
Thu Nov 19 14:13:24 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.
@@ -35,7 +35,7 @@
StringBuilder builder = new StringBuilder();
builder.append(BORDER);
- builder.append("\nSeleninum failure processing comamnd ");
+ builder.append("\nSelenium failure processing command ");
builder.append(command);
builder.append("(");
@@ -161,4 +161,35 @@
delegate.stop();
}
+ /**
+ * @since 5.0.19
+ */
+ public String getRemoteControlServerLocation()
+ {
+ return delegate.getRemoteControlServerLocation();
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void setExtensionJs(String extensionJs)
+ {
+ delegate.setExtensionJs(extensionJs);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void start(String optionsString)
+ {
+ delegate.start(optionsString);
+ }
+
+ /**
+ * @since 5.0.19
+ */
+ public void start(Object optionsObject)
+ {
+ delegate.start(optionsObject);
+ }
}
