[portal-commits] JBoss Portal SVN: r12899 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms.

Author: vrockai Date: 2009-02-26 10:40:18 -0500 (Thu, 26 Feb 2009) New Revision: 12899 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java Log: selenium - some code tweaks Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-02-26 13:18:28 UTC (rev 12898) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-02-26 15:40:18 UTC (rev 12899) @@ -13,8 +13,8 @@ @Test(groups = { "cms_archive_upload" }, enabled = true) public class CMSArchiveUploadTestCase extends JBossPortalSeleniumTestCase { - private static final Integer ARCHIVE_WAITING = 30000; - private static final int n = 10; + private static final Integer ARCHIVE_WAITING = 10000; + private static final int n = 30; /* * uncomment following lines and set the right path to the workspace in the * case you want to use this test case locally from eclipse Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-02-26 13:18:28 UTC (rev 12898) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-02-26 15:40:18 UTC (rev 12899) @@ -46,7 +46,7 @@ public final String LNK_USERTAB = getProp(caseIPfx + "lnk.usertab", "//a[contains(@id,'role-temp-form:manage-users')]"); public final String LNK_USERMAIN = getProp(caseIPfx + "lnk.usermain", "//a[contains(@id,'user-temp-form1:user-adm-link')]"); public final String LNK_USERMANG_MAIN = getProp(caseIPfx + "lnk.usermang.main", "//a[contains(@id,'user-temp-form1:assign-role-link')]"); - public final String SUB_SEARCH_USER = getProp(caseIPfx + "sub.search.user", "//input[contains(@id,'search-user-form:search')]"); + public final String SUB_SEARCH_USER = getProp(caseIPfx + "sub.search.user", "//input[contains(@id,'search-user-form:search') and @type='submit']"); public final String INP_SEARCH_USER = getProp(caseIPfx + "inp.search.user", "//input[contains(@id,'search-user-form:searchString')]"); public final String LNK_SEARCH_USER = getProp(caseIPfx + "lnk.search.user", "//a[contains(@id,'user-form:search-user-link')]"); public final String TBL_USERLIST = getProp(caseIPfx + "tbl.userlist", "//table[contains(@id,'search-user-form1:userlist')]"); @@ -209,7 +209,7 @@ } - @Test(enabled = true, dependsOnMethods = { "testSetRoleReadPer2" }, description = "Set admin/secRole read permissions, login as user w secRole.") + @Test(enabled = true, description = "Set admin/secRole read permissions, login as user w secRole.") public void testSetRoleReadPer1() { login("admin", "admin"); @@ -244,7 +244,7 @@ } - @Test(enabled = true, description = "Set admin/secRole read permissions, login as user w/o secRole.") + @Test(enabled = true, dependsOnMethods = { "testSetRoleReadPer1" }, description = "Set admin/secRole read permissions, login as user w/o secRole.") public void testSetRoleReadPer2() { login("admin", "admin"); @@ -412,12 +412,13 @@ selenium.click(LNK_SEARCH_USER); selenium.waitForPageToLoad(PAGE_LOAD); - + //selenium.setSpeed("5000"); selenium.type(INP_SEARCH_USER, username); + //System.out.println(SUB_SEARCH_USER); selenium.click(SUB_SEARCH_USER); try { - Thread.sleep(5000); + Thread.sleep(10000); } catch (InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -425,6 +426,7 @@ Assert.assertTrue(selenium.isTextPresent(username), "Username was not found."); Assert.assertTrue(selenium.isTextPresent(email), "User email adress was not found."); + //selenium.setSpeed("0"); } private String butUsrRol_id(String userName) {