svn commit: r478860 - in /maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test: AbstractSeleniumTestCase.java XPathExpressionUtil.java

[evenisse]

Author: evenisse
Date: Fri Nov 24 04:49:23 2006
New Revision: 478860

URL: http://svn.apache.org/viewvc?view=rev&rev=478860
Log:
[MNG-2680] refactored and improved function names
Submitted by: Marvin King

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=478860&r1=478859&r2=478860
==============================================================================
--- 
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
 Fri Nov 24 04:49:23 2006
@@ -254,11 +254,16 @@
     //////////////////////////////////////
     public void login( String username, String password )
     {
+        login( username, password, true, "Login Page" );
+    }
+    
+    public void login( String username, String password, boolean valid, String 
assertReturnPage )
+    {
         clickLinkWithText( "Login" );
 
         assertLoginPage();
 
-        submitLoginPage( username, password );
+        submitLoginPage( username, password, false, valid, assertReturnPage );
     }
 
     public void assertLoginPage()
@@ -273,15 +278,15 @@
 
     public void submitLoginPage( String username, String password )
     {
-        submitLoginPage( username, password, false, true );
+        submitLoginPage( username, password, false, true, "Login Page" );
     }
 
     public void submitLoginPage( String username, String password, boolean 
validUsernamePassword )
     {
-        submitLoginPage( username, password, false, validUsernamePassword );
+        submitLoginPage( username, password, false, validUsernamePassword, 
"Login Page" );
     }
 
-    public void submitLoginPage( String username, String password, boolean 
rememberMe, boolean validUsernamePassword )
+    public void submitLoginPage( String username, String password, boolean 
rememberMe, boolean validUsernamePassword, String assertReturnPage )
     {
         assertLoginPage();
         setFieldValue( "username", username );
@@ -291,16 +296,23 @@
             checkField( "rememberMe" );
         }
         clickButtonWithValue( "Login" );
-        waitPage();
+
         if ( validUsernamePassword )
         {
-            assertTextPresent( "Welcome, " + username + " - Logout" );
+            assertTextPresent( "Welcome, ");
             assertLinkPresent( username );
             assertLinkPresent( "Logout" );
         }
         else
         {
-            assertLoginPage();
+            if ( "Login Page".equals( assertReturnPage ) )
+            {    
+                assertLoginPage();
+            }
+            else
+            {
+                assertPage( assertReturnPage );
+            }
         }
     }
 

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=478860&r1=478859&r2=478860
==============================================================================
--- 
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
 Fri Nov 24 04:49:23 2006
@@ -51,9 +51,9 @@
      * @param columnValues the values to be matched in each column, element 
column is included
      * @return
      */
-    public static String columnElementWithSiblingColumnValues( String element, 
int elementIndex, String[] columnValues )
+    public static String getColumnElement( String element, int elementIndex, 
String[] columnValues )
     {
-        return columnElementWithSiblingColumnValues( element, elementIndex, 
null, columnValues );
+        return getColumnElement( element, elementIndex, null, columnValues );
     }
 
     /**
@@ -65,7 +65,7 @@
      * @param columnValues the values to be matched in each column, element 
column is included
      * @return
      */
-    public static String columnElementWithSiblingColumnValues( String element, 
int elementIndex, String elementValue,
+    public static String getColumnElement( String element, int elementIndex, 
String elementValue,
                                                                String[] 
columnValues )
     {
         String xpathExpression = null;
@@ -97,7 +97,7 @@
      * @param columnValues the matched list of columnValues
      * @return
      */
-    public static String matchTableRowOrderedValues( String[] columnValues )
+    public static String getTableRow( String[] columnValues )
     {
         String xpathExpression = null;