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 2008/06/20 18:38:12 UTC
svn commit: r669982 - in /tapestry/tapestry5/trunk/tapestry-test: pom.xml
src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
Author: hlship
Date: Fri Jun 20 09:38:11 2008
New Revision: 669982
URL: http://svn.apache.org/viewvc?rev=669982&view=rev
Log:
TAPESTRY-2469: Update Selenium dependency to the current version, 1.0-beta-1
Modified:
tapestry/tapestry5/trunk/tapestry-test/pom.xml
tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
Modified: tapestry/tapestry5/trunk/tapestry-test/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/pom.xml?rev=669982&r1=669981&r2=669982&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-test/pom.xml Fri Jun 20 09:38:11 2008
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-test</artifactId>
@@ -16,13 +17,13 @@
<dependency>
<groupId>org.openqa.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
- <version>0.9.2</version>
+ <version>1.0-beta-1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.openqa.selenium.server</groupId>
<artifactId>selenium-server</artifactId>
- <version>0.9.2</version>
+ <version>1.0-beta-1</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=669982&r1=669981&r2=669982&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 Fri Jun 20 09:38:11 2008
@@ -262,29 +262,14 @@
selenium.start();
}
- public void addSelection(String locator, String optionLocator)
- {
- selenium.addSelection(locator, optionLocator);
- }
-
- public void answerOnNextPrompt(String answer)
- {
- selenium.answerOnNextPrompt(answer);
- }
-
- public void check(String locator)
- {
- selenium.check(locator);
- }
-
- public void chooseCancelOnNextConfirmation()
+ public void start()
{
- selenium.chooseCancelOnNextConfirmation();
+ selenium.start();
}
- public void chooseOkOnNextConfirmation()
+ public void stop()
{
- selenium.chooseOkOnNextConfirmation();
+ selenium.stop();
}
public void click(String locator)
@@ -297,6 +282,11 @@
selenium.doubleClick(locator);
}
+ public void contextMenu(String locator)
+ {
+ selenium.contextMenu(locator);
+ }
+
public void clickAt(String locator, String coordString)
{
selenium.clickAt(locator, coordString);
@@ -307,9 +297,9 @@
selenium.doubleClickAt(locator, coordString);
}
- public void close()
+ public void contextMenuAt(String locator, String coordString)
{
- selenium.close();
+ selenium.contextMenuAt(locator, coordString);
}
public void fireEvent(String locator, String eventName)
@@ -317,209 +307,217 @@
selenium.fireEvent(locator, eventName);
}
- public String getAlert()
+ public void focus(String locator)
{
- return selenium.getAlert();
+ selenium.focus(locator);
}
- public String[] getAllButtons()
+ public void keyPress(String locator, String keySequence)
{
- return selenium.getAllButtons();
+ selenium.keyPress(locator, keySequence);
}
- public String[] getAllFields()
+ public void shiftKeyDown()
{
- return selenium.getAllFields();
+ selenium.shiftKeyDown();
}
- public String[] getAttributeFromAllWindows(String attributeName)
+ public void shiftKeyUp()
{
- return selenium.getAttributeFromAllWindows(attributeName);
+ selenium.shiftKeyUp();
}
- public void dragdrop(String locator, String movementsString)
+ public void metaKeyDown()
{
- selenium.dragdrop(locator, movementsString);
+ selenium.metaKeyDown();
}
- public void setMouseSpeed(String pixels)
+ public void metaKeyUp()
{
- selenium.setMouseSpeed(pixels);
+ selenium.metaKeyUp();
}
- public Number getMouseSpeed()
+ public void altKeyDown()
{
- return selenium.getMouseSpeed();
+ selenium.altKeyDown();
}
- public void dragAndDrop(String locator, String movementsString)
+ public void altKeyUp()
{
- selenium.dragAndDrop(locator, movementsString);
+ selenium.altKeyUp();
}
- public void dragAndDropToObject(String locatorOfObjectToBeDragged, String locatorOfDragDestinationObject)
+ public void controlKeyDown()
{
- selenium.dragAndDropToObject(locatorOfObjectToBeDragged, locatorOfDragDestinationObject);
+ selenium.controlKeyDown();
}
- public void windowFocus()
+ public void controlKeyUp()
{
- selenium.windowFocus();
+ selenium.controlKeyUp();
}
- public void windowMaximize()
+ public void keyDown(String locator, String keySequence)
{
- selenium.windowMaximize();
+ selenium.keyDown(locator, keySequence);
}
- public String[] getAllWindowIds()
+ public void keyUp(String locator, String keySequence)
{
- return selenium.getAllWindowIds();
+ selenium.keyUp(locator, keySequence);
}
- public String[] getAllWindowNames()
+ public void mouseOver(String locator)
{
- return selenium.getAllWindowNames();
+ selenium.mouseOver(locator);
}
- public String[] getAllWindowTitles()
+ public void mouseOut(String locator)
{
- return selenium.getAllWindowTitles();
+ selenium.mouseOut(locator);
}
- public String[] getAllLinks()
+ public void mouseDown(String locator)
{
- return selenium.getAllLinks();
+ selenium.mouseDown(locator);
}
- public String getAttribute(String attributeLocator)
+ public void mouseDownAt(String locator, String coordString)
{
- return selenium.getAttribute(attributeLocator);
+ selenium.mouseDownAt(locator, coordString);
}
- public String getBodyText()
+ public void mouseUp(String locator)
{
- return selenium.getBodyText();
+ selenium.mouseUp(locator);
}
- public String getConfirmation()
+ public void mouseUpAt(String locator, String coordString)
{
- return selenium.getConfirmation();
+ selenium.mouseUpAt(locator, coordString);
}
- public Number getCursorPosition(String locator)
+ public void mouseMove(String locator)
{
- return selenium.getCursorPosition(locator);
+ selenium.mouseMove(locator);
}
- public String getEval(String script)
+ public void mouseMoveAt(String locator, String coordString)
{
- return selenium.getEval(script);
+ selenium.mouseMoveAt(locator, coordString);
}
- public String getExpression(String expression)
+ public void type(String locator, String value)
{
- return selenium.getExpression(expression);
+ selenium.type(locator, value);
}
- public Number getXpathCount(String xpath)
+ public void typeKeys(String locator, String value)
{
- return selenium.getXpathCount(xpath);
+ selenium.typeKeys(locator, value);
}
- public void assignId(String locator, String identifier)
+ public void setSpeed(String value)
{
- selenium.assignId(locator, identifier);
+ selenium.setSpeed(value);
}
- public void allowNativeXpath(String allow)
+ public String getSpeed()
{
- selenium.allowNativeXpath(allow);
+ return selenium.getSpeed();
}
- public String getHtmlSource()
+ public void check(String locator)
{
- return selenium.getHtmlSource();
+ selenium.check(locator);
}
- public String getLocation()
+ public void uncheck(String locator)
{
- return selenium.getLocation();
+ selenium.uncheck(locator);
}
- public String getPrompt()
+ public void select(String selectLocator, String optionLocator)
{
- return selenium.getPrompt();
+ selenium.select(selectLocator, optionLocator);
}
- public String getSelectedId(String selectLocator)
+ public void addSelection(String locator, String optionLocator)
{
- return selenium.getSelectedId(selectLocator);
+ selenium.addSelection(locator, optionLocator);
}
- public String[] getSelectedIds(String selectLocator)
+ public void removeSelection(String locator, String optionLocator)
{
- return selenium.getSelectedIds(selectLocator);
+ selenium.removeSelection(locator, optionLocator);
}
- public String getSelectedIndex(String selectLocator)
+ public void removeAllSelections(String locator)
{
- return selenium.getSelectedIndex(selectLocator);
+ selenium.removeAllSelections(locator);
}
- public String[] getSelectedIndexes(String selectLocator)
+ public void submit(String formLocator)
{
- return selenium.getSelectedIndexes(selectLocator);
+ selenium.submit(formLocator);
}
- public String getSelectedLabel(String selectLocator)
+ public void open(String url)
{
- return selenium.getSelectedLabel(selectLocator);
+ selenium.open(url);
}
- public String[] getSelectedLabels(String selectLocator)
+ public void openWindow(String url, String windowID)
{
- return selenium.getSelectedLabels(selectLocator);
+ selenium.openWindow(url, windowID);
}
- public String getSelectedValue(String selectLocator)
+ public void selectWindow(String windowID)
{
- return selenium.getSelectedValue(selectLocator);
+ selenium.selectWindow(windowID);
}
- public String[] getSelectedValues(String selectLocator)
+ public void selectFrame(String locator)
{
- return selenium.getSelectedValues(selectLocator);
+ selenium.selectFrame(locator);
}
- public String[] getSelectOptions(String selectLocator)
+ public boolean getWhetherThisFrameMatchFrameExpression(String currentFrameString, String target)
{
- return selenium.getSelectOptions(selectLocator);
+ return selenium.getWhetherThisFrameMatchFrameExpression(currentFrameString, target);
}
- public String getTable(String tableCellAddress)
+ public boolean getWhetherThisWindowMatchWindowExpression(String currentWindowString, String target)
{
- return selenium.getTable(tableCellAddress);
+ return selenium.getWhetherThisWindowMatchWindowExpression(currentWindowString, target);
}
- public String getText(String locator)
+ /**
+ * Waits the default time for the page to load.
+ */
+ public void waitForPageToLoad()
{
- return selenium.getText(locator);
+ waitForPageToLoad(PAGE_LOAD_TIMEOUT);
}
- public void highlight(String locator)
+ public void waitForPopUp(String windowID, String timeout)
{
- selenium.highlight(locator);
+ selenium.waitForPopUp(windowID, timeout);
}
- public String getTitle()
+ public void chooseCancelOnNextConfirmation()
{
- return selenium.getTitle();
+ selenium.chooseCancelOnNextConfirmation();
}
- public String getValue(String locator)
+ public void chooseOkOnNextConfirmation()
{
- return selenium.getValue(locator);
+ selenium.chooseOkOnNextConfirmation();
+ }
+
+ public void answerOnNextPrompt(String answer)
+ {
+ selenium.answerOnNextPrompt(answer);
}
public void goBack()
@@ -527,14 +525,24 @@
selenium.goBack();
}
+ public void refresh()
+ {
+ selenium.refresh();
+ }
+
+ public void close()
+ {
+ selenium.close();
+ }
+
public boolean isAlertPresent()
{
return selenium.isAlertPresent();
}
- public boolean isChecked(String locator)
+ public boolean isPromptPresent()
{
- return selenium.isChecked(locator);
+ return selenium.isPromptPresent();
}
public boolean isConfirmationPresent()
@@ -542,181 +550,214 @@
return selenium.isConfirmationPresent();
}
- public boolean isEditable(String locator)
+ public String getAlert()
{
- return selenium.isEditable(locator);
+ return selenium.getAlert();
}
- public boolean isElementPresent(String locator)
+ public String getConfirmation()
{
- return selenium.isElementPresent(locator);
+ return selenium.getConfirmation();
}
- public boolean isPromptPresent()
+ public String getPrompt()
{
- return selenium.isPromptPresent();
+ return selenium.getPrompt();
}
- public boolean isSomethingSelected(String selectLocator)
+ public String getLocation()
{
- return selenium.isSomethingSelected(selectLocator);
+ return selenium.getLocation();
}
- public boolean isTextPresent(String pattern)
+ public String getTitle()
{
- return selenium.isTextPresent(pattern);
+ return selenium.getTitle();
}
- public boolean isVisible(String locator)
+ public String getBodyText()
{
- return selenium.isVisible(locator);
+ return selenium.getBodyText();
}
- public void keyDown(String locator, String keycode)
+ public String getValue(String locator)
{
- selenium.keyDown(locator, keycode);
+ return selenium.getValue(locator);
}
- public void keyPress(String locator, String keycode)
+ public String getText(String locator)
{
- selenium.keyPress(locator, keycode);
+ return selenium.getText(locator);
}
- public void shiftKeyDown()
+ public void highlight(String locator)
{
- selenium.shiftKeyDown();
+ selenium.highlight(locator);
}
- public void shiftKeyUp()
+ public String getEval(String script)
{
- selenium.shiftKeyUp();
+ return selenium.getEval(script);
}
- public void metaKeyDown()
+ public boolean isChecked(String locator)
{
- selenium.metaKeyDown();
+ return selenium.isChecked(locator);
}
- public void metaKeyUp()
+ public String getTable(String tableCellAddress)
{
- selenium.metaKeyUp();
+ return selenium.getTable(tableCellAddress);
}
- public void altKeyDown()
+ public String[] getSelectedLabels(String selectLocator)
{
- selenium.altKeyDown();
+ return selenium.getSelectedLabels(selectLocator);
}
- public void altKeyUp()
+ public String getSelectedLabel(String selectLocator)
{
- selenium.altKeyUp();
+ return selenium.getSelectedLabel(selectLocator);
}
- public void controlKeyDown()
+ public String[] getSelectedValues(String selectLocator)
{
- selenium.controlKeyDown();
+ return selenium.getSelectedValues(selectLocator);
}
- public void controlKeyUp()
+ public String getSelectedValue(String selectLocator)
{
- selenium.controlKeyUp();
+ return selenium.getSelectedValue(selectLocator);
}
- public void keyUp(String locator, String keycode)
+ public String[] getSelectedIndexes(String selectLocator)
{
- selenium.keyUp(locator, keycode);
+ return selenium.getSelectedIndexes(selectLocator);
}
- public void mouseDown(String locator)
+ public String getSelectedIndex(String selectLocator)
{
- selenium.mouseDown(locator);
+ return selenium.getSelectedIndex(selectLocator);
}
- public void mouseDownAt(String locator, String coordString)
+ public String[] getSelectedIds(String selectLocator)
{
- selenium.mouseDownAt(locator, coordString);
+ return selenium.getSelectedIds(selectLocator);
}
- public void mouseUp(String locator)
+ public String getSelectedId(String selectLocator)
{
- selenium.mouseUp(locator);
+ return selenium.getSelectedId(selectLocator);
}
- public void mouseUpAt(String locator, String coordString)
+ public boolean isSomethingSelected(String selectLocator)
{
- selenium.mouseUpAt(locator, coordString);
+ return selenium.isSomethingSelected(selectLocator);
}
- public void mouseMove(String locator)
+ public String[] getSelectOptions(String selectLocator)
{
- selenium.mouseMove(locator);
+ return selenium.getSelectOptions(selectLocator);
}
- public void mouseMoveAt(String locator, String coordString)
+ public String getAttribute(String attributeLocator)
{
- selenium.mouseMoveAt(locator, coordString);
+ return selenium.getAttribute(attributeLocator);
}
- public void mouseOver(String locator)
+ public boolean isTextPresent(String pattern)
{
- selenium.mouseOver(locator);
+ return selenium.isTextPresent(pattern);
}
- public void mouseOut(String locator)
+ public boolean isElementPresent(String locator)
{
- selenium.mouseOut(locator);
+ return selenium.isElementPresent(locator);
}
- public void open(String url)
+ public boolean isVisible(String locator)
{
- selenium.open(url);
+ return selenium.isVisible(locator);
+ }
- waitForPageToLoad(PAGE_LOAD_TIMEOUT);
+ public boolean isEditable(String locator)
+ {
+ return selenium.isEditable(locator);
}
- public void openWindow(String url, String windowID)
+ public String[] getAllButtons()
{
- selenium.openWindow(url, windowID);
+ return selenium.getAllButtons();
}
- public void refresh()
+ public String[] getAllLinks()
{
- selenium.refresh();
+ return selenium.getAllLinks();
}
- public void removeSelection(String locator, String optionLocator)
+ public String[] getAllFields()
{
- selenium.removeSelection(locator, optionLocator);
+ return selenium.getAllFields();
}
- public void removeAllSelections(String locator)
+ public String[] getAttributeFromAllWindows(String attributeName)
{
- selenium.removeAllSelections(locator);
+ return selenium.getAttributeFromAllWindows(attributeName);
}
- public void select(String selectLocator, String optionLocator)
+ public void dragdrop(String locator, String movementsString)
{
- selenium.select(selectLocator, optionLocator);
+ selenium.dragdrop(locator, movementsString);
}
- public void selectWindow(String windowID)
+ public void setMouseSpeed(String pixels)
{
- selenium.selectWindow(windowID);
+ selenium.setMouseSpeed(pixels);
}
- public void selectFrame(String locator)
+ public Number getMouseSpeed()
{
- selenium.selectFrame(locator);
+ return selenium.getMouseSpeed();
}
- public boolean getWhetherThisFrameMatchFrameExpression(String currentFrameString, String target)
+ public void dragAndDrop(String locator, String movementsString)
{
- return selenium.getWhetherThisFrameMatchFrameExpression(currentFrameString, target);
+ selenium.dragAndDrop(locator, movementsString);
}
- public boolean getWhetherThisWindowMatchWindowExpression(String currentWindowString, String target)
+ public void dragAndDropToObject(String locatorOfObjectToBeDragged, String locatorOfDragDestinationObject)
{
- return selenium.getWhetherThisWindowMatchWindowExpression(currentWindowString, target);
+ selenium.dragAndDropToObject(locatorOfObjectToBeDragged, locatorOfDragDestinationObject);
+ }
+
+ public void windowFocus()
+ {
+ selenium.windowFocus();
+ }
+
+ public void windowMaximize()
+ {
+ selenium.windowMaximize();
+ }
+
+ public String[] getAllWindowIds()
+ {
+ return selenium.getAllWindowIds();
+ }
+
+ public String[] getAllWindowNames()
+ {
+ return selenium.getAllWindowNames();
+ }
+
+ public String[] getAllWindowTitles()
+ {
+ return selenium.getAllWindowTitles();
+ }
+
+ public String getHtmlSource()
+ {
+ return selenium.getHtmlSource();
}
public void setCursorPosition(String locator, String position)
@@ -754,54 +795,44 @@
return selenium.getElementHeight(locator);
}
- public void setTimeout(String timeout)
- {
- selenium.setTimeout(timeout);
- }
-
- public void start()
- {
- selenium.start();
- }
-
- public void stop()
+ public Number getCursorPosition(String locator)
{
- selenium.stop();
+ return selenium.getCursorPosition(locator);
}
- public void submit(String formLocator)
+ public String getExpression(String expression)
{
- selenium.submit(formLocator);
+ return selenium.getExpression(expression);
}
- public void type(String locator, String value)
+ public Number getXpathCount(String xpath)
{
- selenium.type(locator, value);
+ return selenium.getXpathCount(xpath);
}
- public void typeKeys(String locator, String value)
+ public void assignId(String locator, String identifier)
{
- selenium.typeKeys(locator, value);
+ selenium.assignId(locator, identifier);
}
- public void setSpeed(String value)
+ public void allowNativeXpath(String allow)
{
- selenium.setSpeed(value);
+ selenium.allowNativeXpath(allow);
}
- public void getSpeed()
+ public void ignoreAttributesWithoutValue(String ignore)
{
- selenium.getSpeed();
+ selenium.ignoreAttributesWithoutValue(ignore);
}
- public void uncheck(String locator)
+ public void waitForCondition(String script, String timeout)
{
- selenium.uncheck(locator);
+ selenium.waitForCondition(script, timeout);
}
- public void waitForCondition(String script, String timeout)
+ public void setTimeout(String timeout)
{
- selenium.waitForCondition(script, timeout);
+ selenium.setTimeout(timeout);
}
public void waitForPageToLoad(String timeout)
@@ -819,14 +850,29 @@
return selenium.getCookie();
}
+ public String getCookieByName(String name)
+ {
+ return selenium.getCookieByName(name);
+ }
+
+ public boolean isCookiePresent(String name)
+ {
+ return selenium.isCookiePresent(name);
+ }
+
public void createCookie(String nameValuePair, String optionsString)
{
selenium.createCookie(nameValuePair, optionsString);
}
- public void deleteCookie(String name, String path)
+ public void deleteCookie(String name, String optionsString)
+ {
+ selenium.deleteCookie(name, optionsString);
+ }
+
+ public void deleteAllVisibleCookies()
{
- selenium.deleteCookie(name, path);
+ selenium.deleteAllVisibleCookies();
}
public void setBrowserLogLevel(String logLevel)
@@ -844,28 +890,44 @@
selenium.addLocationStrategy(strategyName, functionDefinition);
}
+ public void captureEntirePageScreenshot(String filename)
+ {
+ selenium.captureEntirePageScreenshot(filename);
+ }
+
public void setContext(String context)
{
selenium.setContext(context);
}
+ public void attachFile(String fieldLocator, String fileLocator)
+ {
+ selenium.attachFile(fieldLocator, fileLocator);
+ }
+
public void captureScreenshot(String filename)
{
selenium.captureScreenshot(filename);
}
+ public void shutDownSeleniumServer()
+ {
+ selenium.shutDownSeleniumServer();
+ }
- /**
- * Waits the default time for the page to load.
- */
- public void waitForPageToLoad()
+ public void keyDownNative(String keycode)
{
- waitForPageToLoad(PAGE_LOAD_TIMEOUT);
+ selenium.keyDownNative(keycode);
}
- public void waitForPopUp(String windowID, String timeout)
+ public void keyUpNative(String keycode)
{
- selenium.waitForPopUp(windowID, timeout);
+ selenium.keyUpNative(keycode);
+ }
+
+ public void keyPressNative(String keycode)
+ {
+ selenium.keyPressNative(keycode);
}
/**