You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2006/12/22 22:28:42 UTC
svn commit: r489771 - in /maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test: AccountSecurityTest.java SchedulesPageTest.java

Author: evenisse
Date: Fri Dec 22 13:28:41 2006
New Revision: 489771

URL: http://svn.apache.org/viewvc?view=rev&rev=489771
Log:
Fix schedules tests

Modified:
    maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AccountSecurityTest.java
    maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/SchedulesPageTest.java

Modified: maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AccountSecurityTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AccountSecurityTest.java?view=diff&rev=489771&r1=489770&r2=489771
==============================================================================
--- maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AccountSecurityTest.java (original)
+++ maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AccountSecurityTest.java Fri Dec 22 13:28:41 2006
@@ -281,10 +281,8 @@
         clickLinkWithText( "Users" );
 
         // delete user
-        //clickLinkWithXPath(
-        //    XPathExpressionUtil.getImgColumnElement( XPathExpressionUtil.ANCHOR, 7, "delete.gif", columnValues ) );
         clickLinkWithXPath(
-            XPathExpressionUtil.getColumnElement( XPathExpressionUtil.ANCHOR, 7, columnValues ) + "/img[contains(@src, 'delete.gif')]" );
+            XPathExpressionUtil.getImgColumnElement( XPathExpressionUtil.ANCHOR, 7, "delete.gif", columnValues ) );
 
         // confirm
         assertDeleteUserPage( userName );

Modified: maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/SchedulesPageTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/SchedulesPageTest.java?view=diff&rev=489771&r1=489770&r2=489771
==============================================================================
--- maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/SchedulesPageTest.java (original)
+++ maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/SchedulesPageTest.java Fri Dec 22 13:28:41 2006
@@ -165,7 +165,7 @@
 
         // edit the schedule        
         clickLinkWithXPath(
-            XPathExpressionUtil.getColumnElement( XPathExpressionUtil.ANCHOR, 5, "Edit", columnValues ) );
+            XPathExpressionUtil.getImgColumnElement( XPathExpressionUtil.ANCHOR, 5, "edit.gif", columnValues ) );
 
         inputSchedule( SCHEDULE_NAME_EDIT + "modified", SCHEDULE_DESCRIPTION + "updated", "2", "3", "4", "?", "6", "7",
                        "2021", "8", "9", false );
@@ -180,7 +180,7 @@
 
         // check if the active state has been saved
         clickLinkWithXPath(
-            XPathExpressionUtil.getColumnElement( XPathExpressionUtil.ANCHOR, 5, "Edit", editedColumnValues ) );
+            XPathExpressionUtil.getImgColumnElement( XPathExpressionUtil.ANCHOR, 5, "edit.gif", editedColumnValues ) );
 
         assertEquals( "Can disable the schedule", CHECKBOX_UNCHECK, getFieldValue( "active" ) );
 
@@ -299,7 +299,7 @@
         String[] columnValues = {scheduleName};
 
         clickLinkWithXPath(
-            XPathExpressionUtil.getColumnElement( XPathExpressionUtil.ANCHOR, 5, "Delete", columnValues ) );
+            XPathExpressionUtil.getImgColumnElement( XPathExpressionUtil.ANCHOR, 5, "delete.gif", columnValues ) );
 
         // deletion confirmation page
         assertPage( "Schedule Removal" );