Author: vrockai
Date: 2009-02-25 10:05:56 -0500 (Wed, 25 Feb 2009)
New Revision: 12894
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
Log:
search users test fix
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-02-25
14:34:40 UTC (rev 12893)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-02-25
15:05:56 UTC (rev 12894)
@@ -63,7 +63,7 @@
public final String INP_PASSWORD = getProp(casePfx + "inp.password",
"//input[contains(@id,'register-form:password')]");
public final String INP_USEREMAIL = getProp(casePfx + "inp.useremail",
"//input[contains(@id,'register-form:email')]");
public final String INP_USERNAME = getProp(casePfx + "inp.username",
"//input[contains(@id,'register-form:username')]");
- public final String SUB_SEARCH_USER = getProp(casePfx + "sub.search.user",
"//input[contains(@id,'search-user-form:search')]");
+ public final String SUB_SEARCH_USER = getProp(casePfx + "sub.search.user",
"//input[contains(@id,'search-user-form:search') and
@type='submit']");
public final String INP_SEARCH_USER = getProp(casePfx + "inp.search.user",
"//input[contains(@id,'search-user-form:searchString')]");
public final String LNK_SEARCH_USER = getProp(casePfx + "lnk.search.user",
"//a[contains(@id,'user-form:search-user-link')]");
public final String LNK_USERTAB = getProp(casePfx + "lnk.usertab",
"//a[contains(@id,'role-temp-form:manage-users')]");
@@ -444,10 +444,10 @@
searchSimple("man", "50");
Assert.assertEquals(countTableRows(TBL_USERLIST) - 1, 50, "Wrong number of row in
user table #2.");
- selenium.click("search-user-form1:next-page");
+ selenium.click("//input[contains(@id,'search-user-form1:next-page')]");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals(countTableRows(TBL_USERLIST) - 1, 45, "Wrong number of row in
user table #3.");
- selenium.click("search-user-form1:prev-page");
+ selenium.click("//input[contains(@id,'search-user-form1:prev-page')]");
selenium.waitForPageToLoad(PAGE_LOAD);
searchSimple("man", "100");
@@ -742,7 +742,7 @@
waitFor(SEARCH_TIMEOUT);
selenium.type(INP_SEARCH_USER, name);
selenium.click(SUB_SEARCH_USER);
- selenium.waitForPageToLoad(PAGE_LOAD);
+
waitFor(SEARCH_TIMEOUT);
}
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-02-25
14:34:40 UTC (rev 12893)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-02-25
15:05:56 UTC (rev 12894)
@@ -62,7 +62,7 @@
iden.man.inp.password=//input[contains(@id,'register-form:password')]
iden.man.inp.useremail=//input[contains(@id,'register-form:email')]
iden.man.inp.username=//input[contains(@id,'register-form:username')]
-iden.man.sub.search.user=//input[contains(@id,'search-user-form:search')]
+iden.man.sub.search.user=//input[contains(@id,'search-user-form:search') and
@type='submit']
iden.man.inp.search.user=//input[contains(@id,'search-user-form:searchString')]
iden.man.lnk.search.user=//a[contains(@id,'user-form:search-user-link')]
iden.man.lnk.usertab=//a[contains(@id,'role-temp-form:manage-users')]
Show replies by date