You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ev...@apache.org on 2006/11/28 12:10:50 UTC
svn commit: r479989 - in
/maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test:
AbstractSeleniumTestCase.java XPathExpressionUtil.java
Author: evenisse
Date: Tue Nov 28 03:10:49 2006
New Revision: 479989
URL: http://svn.apache.org/viewvc?view=rev&rev=479989
Log:
Add some utility methods
Modified:
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/XPathExpressionUtil.java
Modified: maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java?view=diff&rev=479989&r1=479988&r2=479989
==============================================================================
--- maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java (original)
+++ maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java Tue Nov 28 03:10:49 2006
@@ -118,6 +118,25 @@
assertFalse( "The link '" + text + "' is present.", sel.isElementPresent( "link=" + text ) );
}
+ public void assertImgWithAlt( String alt )
+ {
+ assertElementPresent( "//img[@alt='" + alt + "']" );
+ }
+
+ public void assertImgWithAltAtRowCol( boolean isALink, String alt, int row, int column )
+ {
+ String locator = "//tr[" + row + "]/td[" + column + "]/";
+ locator += isALink ? "a/" : "";
+ locator += "img[@alt='" + alt + "']";
+
+ assertElementPresent( locator );
+ }
+
+ public void assertCellValueFromTable( String expected, String tableElement, int row, int column )
+ {
+ assertEquals( expected, getCellValueFromTable( tableElement, row, column ) );
+ }
+
public boolean isTextPresent( String text )
{
return sel.isTextPresent( text );
@@ -161,6 +180,16 @@
return sel.getValue( fieldName );
}
+ public String getCellValueFromTable( String tableElement, int row, int column )
+ {
+ return getSelenium().getTable( tableElement + "." + row + "." + column );
+ }
+
+ public void selectValue( String locator, String value )
+ {
+ getSelenium().select( locator, "label=" + value );
+ }
+
public void submit()
{
clickLinkWithXPath( "//input[@type='submit']" );
@@ -183,6 +212,21 @@
}
}
+ public void clickSubmitWithLocator( String locator )
+ {
+ clickLinkWithLocator( locator );
+ }
+
+ public void clickSubmitWithLocator( String locator, boolean wait )
+ {
+ clickLinkWithLocator( locator, wait );
+ }
+
+ public void clickImgWithAlt( String alt )
+ {
+ clickLinkWithLocator( "//img[@alt='" + alt + "']" );
+ }
+
public void clickLinkWithText( String text )
{
clickLinkWithText( text, true );
@@ -256,7 +300,7 @@
{
login( username, password, true, "Login Page" );
}
-
+
public void login( String username, String password, boolean valid, String assertReturnPage )
{
clickLinkWithText( "Login" );
@@ -286,7 +330,8 @@
submitLoginPage( username, password, false, validUsernamePassword, "Login Page" );
}
- public void submitLoginPage( String username, String password, boolean rememberMe, boolean validUsernamePassword, String assertReturnPage )
+ public void submitLoginPage( String username, String password, boolean rememberMe, boolean validUsernamePassword,
+ String assertReturnPage )
{
assertLoginPage();
setFieldValue( "username", username );
@@ -299,14 +344,14 @@
if ( validUsernamePassword )
{
- assertTextPresent( "Welcome, ");
+ assertTextPresent( "Welcome, " );
assertLinkPresent( username );
assertLinkPresent( "Logout" );
}
else
{
if ( "Login Page".equals( assertReturnPage ) )
- {
+ {
assertLoginPage();
}
else
Modified: maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/XPathExpressionUtil.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/XPathExpressionUtil.java?view=diff&rev=479989&r1=479988&r2=479989
==============================================================================
--- maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/XPathExpressionUtil.java (original)
+++ maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/XPathExpressionUtil.java Tue Nov 28 03:10:49 2006
@@ -66,7 +66,7 @@
* @return
*/
public static String getColumnElement( String element, int elementIndex, String elementValue,
- String[] columnValues )
+ String[] columnValues )
{
String xpathExpression = null;