Author: vrockai Date: 2009-01-19 09:11:24 -0500 (Mon, 19 Jan 2009) New Revision: 12551 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 branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java Log: test 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-01-19 13:32:08 UTC (rev 12550) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-01-19 14:11:24 UTC (rev 12551) @@ -13,14 +13,14 @@ @Test(groups = { "cms_archive_upload" }, enabled = true) public class CMSArchiveUploadTestCase extends JBossPortalSeleniumTestCase { - private static final String ARCHIVE_WAITING = "90000"; + private static final String ARCHIVE_WAITING = "120000"; /* uncomment following lines and set the right path to the workspace in the case * you want to use this test case locally from eclipse */ - /* + { - System.setProperty("workspace","/home/vrockai/workspace/selenium/selenium/"); + System.setProperty("workspace","/home/vrockai/workspace/p2.7tests/ui-tests/"); } - */ + private static final String SUB_CANCEL_ARCH_UPLOAD = "cancel"; private static final String LNK_ADMIN = "link=Admin"; private static final String LNK_CMS = "link=CMS"; @@ -79,9 +79,7 @@ selenium.click(SUB_SEND_ARCHIVE); selenium.waitForPageToLoad(PAGE_LOAD); - // - selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertEquals(selenium.getText(DIV_ARCHIVE_STATUS), "Your archive has been accepted for processing. The resources will appear in your Folder once the processing is finished"); 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-01-19 13:32:08 UTC (rev 12550) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-01-19 14:11:24 UTC (rev 12551) @@ -297,11 +297,13 @@ selenium.open("/portal/portal/default"); selenium.waitForPageToLoad(PAGE_LOAD); + Assert.assertFalse(selenium.isTextPresent("Enteprise Portal Platform")); Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']")); selenium.click(LNK_EXPLORE); selenium.waitForPageToLoad(PAGE_LOAD); + Assert.assertTrue(selenium.isTextPresent("Enteprise Portal Platform")); Assert.assertFalse(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']")); - + login("admin", "admin"); selenium.click(LNK_ADMIN); selenium.waitForPageToLoad(PAGE_LOAD); @@ -323,12 +325,14 @@ selenium.waitForPageToLoad(PAGE_LOAD); logout(); + Assert.assertFalse(selenium.isTextPresent("Enteprise Portal Platform")); Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']")); selenium.open("/portal/portal/default"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_EXPLORE); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']")); + Assert.assertFalse(selenium.isTextPresent("Enteprise Portal Platform")); + Assert.assertFalse(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']")); } Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-01-19 13:32:08 UTC (rev 12550) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-01-19 14:11:24 UTC (rev 12551) @@ -68,9 +68,9 @@ int r = traversePortlets(NAME_COUNTPORT,0); clickAndWait(MessageFormat.format(LNK_INSTANCE_BUTTON, r)); - safeSelect(SELECT_LANGUAGE, "Czech"); + safeSelect(SELECT_LANGUAGE, "English"); - final String name = "Administracny"; + final String name = "Administracning"; selenium.type(INPUT_NAME, name); clickAndWait(SUBMIT_MODIFY_NAME); Assert.assertTrue(findTableRow(TABLE_DISPNAMES, name, 1) >= 0);