Author: vrockai Date: 2009-01-13 09:48:33 -0500 (Tue, 13 Jan 2009) New Revision: 12487 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java Log: portal admin tweak Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-01-13 13:57:31 UTC (rev 12486) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-01-13 14:48:33 UTC (rev 12487) @@ -68,15 +68,16 @@ clickIfVisible(TAB_PORTALOBJ_ID); clickIfVisible(LINK_PORTALS_ID); - Assert.assertFalse(selenium.isTextPresent("TestPortal"), "Not created page already exist."); + final String portalName = "TestPortal"; + Assert.assertFalse(selenium.isTextPresent(portalName), "Not created page already exist."); - selenium.type(INPUT_PORTALNAME, "TestPortal"); + selenium.type(INPUT_PORTALNAME, portalName); selenium.click(INPUT_SUBMIT_CREATEPORTAL); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isTextPresent("TestPortal")); + Assert.assertTrue(selenium.isTextPresent(portalName)); - int r = findTableRow(TABLE_PORTAL_ADMIN, "TestPortal", 0) - 1; + int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1; Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_MAIN, r))); Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_SECURITY, r))); @@ -88,47 +89,84 @@ @Test(enabled = true, dependsOnMethods = { "testPortalCreate" }) public void testPortalRename() { + // first create a portal + selenium.click("link=Admin"); selenium.waitForPageToLoad(PAGE_LOAD); clickIfVisible(TAB_PORTALOBJ_ID); clickIfVisible(LINK_PORTALS_ID); + + final String portalName = "TestRenPortal"; + Assert.assertFalse(selenium.isTextPresent(portalName), "Not created page already exist."); - Assert.assertTrue(selenium.isTextPresent("TestPortal")); - Assert.assertFalse(selenium.isTextPresent("AestPortal"), "Not created page already exist."); + selenium.type(INPUT_PORTALNAME, portalName); + selenium.click(INPUT_SUBMIT_CREATEPORTAL); + selenium.waitForPageToLoad(PAGE_LOAD); + + // then rename it + + selenium.click("link=Admin"); + selenium.waitForPageToLoad(PAGE_LOAD); - int r = findTableRow(TABLE_PORTAL_ADMIN, "TestPortal", 0) - 1; + clickIfVisible(TAB_PORTALOBJ_ID); + clickIfVisible(LINK_PORTALS_ID); + final String portalToRename = "TestRenPortal"; + Assert.assertTrue(selenium.isTextPresent(portalToRename)); + final String portalRenamed = "AestPortal"; + Assert.assertFalse(selenium.isTextPresent(portalRenamed), "Not created page already exist."); + + int r = findTableRow(TABLE_PORTAL_ADMIN, portalToRename, 0) - 1; + selenium.click(MessageFormat.format(POR_TL_RENAME, r)); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.type(INPUT_RENAME_PORTAL, "AestPortal"); + selenium.type(INPUT_RENAME_PORTAL, portalRenamed); selenium.click(SUBMIT_RENAME_PORTAL); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertFalse(selenium.isTextPresent("TestPortal")); - Assert.assertTrue(selenium.isTextPresent("AestPortal")); + Assert.assertFalse(selenium.isTextPresent(portalToRename)); + Assert.assertTrue(selenium.isTextPresent(portalRenamed)); } @Test(enabled = true, dependsOnMethods = { "testPortalCreate" }) public void testPortalDelete() { + // first create a portal + selenium.click("link=Admin"); selenium.waitForPageToLoad(PAGE_LOAD); clickIfVisible(TAB_PORTALOBJ_ID); clickIfVisible(LINK_PORTALS_ID); + + final String portalName = "TestDelete"; + Assert.assertFalse(selenium.isTextPresent(portalName), "Not created page already exist."); - selenium.type(INPUT_PORTALNAME, "TestDelete"); + selenium.type(INPUT_PORTALNAME, portalName); selenium.click(INPUT_SUBMIT_CREATEPORTAL); selenium.waitForPageToLoad(PAGE_LOAD); + + // then delete it + + selenium.click("link=Admin"); + selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isTextPresent("TestDelete")); + clickIfVisible(TAB_PORTALOBJ_ID); + clickIfVisible(LINK_PORTALS_ID); - int r = findTableRow(TABLE_PORTAL_ADMIN, "TestDelete", 0) - 1; + final String portalToDelete = "TestDelete"; + selenium.type(INPUT_PORTALNAME, portalToDelete); + selenium.click(INPUT_SUBMIT_CREATEPORTAL); + selenium.waitForPageToLoad(PAGE_LOAD); + Assert.assertTrue(selenium.isTextPresent(portalToDelete)); + + int r = findTableRow(TABLE_PORTAL_ADMIN, portalToDelete, 0) - 1; + selenium.click(MessageFormat.format(POR_TL_DELETE, r)); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isTextPresent("WARNING! You are about to delete the TestDelete portal from the context!")); + Assert.assertTrue(selenium.isTextPresent("WARNING! You are about to delete the "+portalToDelete+" portal from the context!")); Assert.assertTrue(selenium.isTextPresent("Delete portal")); Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this portal?")); selenium.click(SUBMIT_DELETE_PORTAL_CONF); @@ -137,22 +175,23 @@ clickIfVisible("link=Admin"); clickIfVisible(TAB_PORTALOBJ_ID); - Assert.assertFalse(selenium.isTextPresent("TestDelete")); + Assert.assertFalse(selenium.isTextPresent(portalToDelete)); } - @Test(enabled = true) + @Test(enabled = true, dependsOnMethods = { "testPortalCreate" }) public void testAddPage() { + final String portalName = "TestAddPagePortal"; + final String portalPage = "tToAddPage"; + selenium.click("link=Admin"); selenium.waitForPageToLoad(PAGE_LOAD); clickIfVisible(TAB_PORTALOBJ_ID); clickIfVisible(LINK_PORTALS_ID); - final String portalName = "TestAddPortal"; - final String portalPage = "tPage"; - + selenium.type(INPUT_PORTALNAME, portalName); selenium.click(INPUT_SUBMIT_CREATEPORTAL); selenium.waitForPageToLoad(PAGE_LOAD); @@ -171,17 +210,21 @@ Assert.assertTrue(selenium.isTextPresent(portalPage)); } - @Test(enabled = true, dependsOnMethods = { "testAddPage" }) + @Test(enabled = true, dependsOnMethods = { "testPortalCreate","testAddPage" }) public void testRemovePage() { + + final String portalName = "TestRemovePagePortal"; + final String portalPage = "tRemPage"; - final String portalName = "TestAddPortal"; - final String portalPage = "tPage"; - + createPortal(portalName); + createPage(portalName, portalPage); + selenium.click("link=Admin"); selenium.waitForPageToLoad(PAGE_LOAD); clickIfVisible(TAB_PORTALOBJ_ID); clickIfVisible(LINK_PORTALS_ID); + clickIfVisible(LINK_PORTAL_HOME); int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1; @@ -199,7 +242,7 @@ } - @Test(enabled = true) + @Test(enabled = true, dependsOnMethods = { "testPortalCreate", "testAddPage" }) public void testCreateWindow() { final String portalName = "toAddWindowPortal"; @@ -250,7 +293,7 @@ } - @Test(enabled = true, dependsOnMethods={"testPortalCreate"}) + @Test(enabled = true, dependsOnMethods={"testPortalCreate", "testAddPage"}) public void testPageRename(){ String portalName = "TestPortal"; String pageName = "PageToRename";