Author: vrockai Date: 2008-09-25 06:44:44 -0400 (Thu, 25 Sep 2008) New Revision: 11978 Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java Log: dashboard and portal admin fix Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-25 07:04:17 UTC (rev 11977) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-25 10:44:44 UTC (rev 11978) @@ -20,7 +20,6 @@ @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { - //selenium.setSpeed("3000"); login("admin", "admin"); } @@ -53,12 +52,9 @@ selenium.click("link=Configure dashboard"); selenium.waitForPageToLoad(PAGE_LOAD); - - System.out.println(selenium.getSelectedLabel(SELECT_PAGE)); if (!selenium.getSelectedLabel(SELECT_PAGE).equals("DashTestPage")) selenium.select(SELECT_PAGE, "label=DashTestPage"); - - //selenium.waitForPageToLoad(PAGE_LOAD); + selenium.waitForPageToLoad(PAGE_LOAD); selenium.select(SELECT_THEME, "label=renaissance"); selenium.click(SUBMIT_THEMESEL); @@ -85,8 +81,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); if (!selenium.getSelectedLabel(SELECT_PAGE).equals("DashTestPage")) selenium.select(SELECT_PAGE, "label=DashTestPage"); - //selenium.waitForPageToLoad(PAGE_LOAD); - + selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertEquals("default", selenium.getSelectedLabel(SELECT_LAYOUT)); selenium.select(SELECT_LAYOUT, "label=generic"); @@ -114,7 +109,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); if (!selenium.getSelectedLabel(SELECT_PAGE).equals("DashTestPage")) selenium.select(SELECT_PAGE, "label=DashTestPage"); - //selenium.waitForPageToLoad(PAGE_LOAD); + selenium.waitForPageToLoad(PAGE_LOAD); selenium.click("link=Who's online portlet"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click("layoutForm:a_center"); @@ -128,7 +123,7 @@ Assert.assertTrue(selenium.isTextPresent("[admin]")); } - @Test(enabled = true, dependsOnMethods = { "testCreatePage" }) + @Test(enabled = false, dependsOnMethods = { "testCreatePage" }) public void testAddGooglePortlet() { selenium.click("link=Dashboard"); selenium.waitForPageToLoad(PAGE_LOAD); @@ -136,7 +131,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); if (!selenium.getSelectedLabel(SELECT_PAGE).equals("DashTestPage")) selenium.select(SELECT_PAGE, "label=DashTestPage"); - //selenium.waitForPageToLoad(PAGE_LOAD); + selenium.waitForPageToLoad(PAGE_LOAD); selenium.select("abc:instanceId", "label=widget/google"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click("link=Hindu God of the Week"); @@ -145,7 +140,6 @@ selenium.waitForPageToLoad(PAGE_LOAD); selenium.click("link=Dashboard"); selenium.waitForPageToLoad(PAGE_LOAD); - //selenium.setSpeed("10000"); selenium.click("link=DashTestPage"); selenium.waitForPageToLoad(PAGE_LOAD); Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-09-25 07:04:17 UTC (rev 11977) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-09-25 10:44:44 UTC (rev 11978) @@ -11,6 +11,9 @@ @Test(groups = { "admin_portal" }, enabled = true, description = "Partal administrating.") public class AdminPortalTestCase extends JBossPortalSeleniumTestCase { + private static final String SUBMIT_RENAME_PORTAL = "renameForm:rename"; + private static final String INPUT_RENAME_PORTAL = "renameForm:newName"; + private static final String SUBMIT_DELETE_PORTAL_CONF = "_id29jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:confirm-form:delete"; private static final String INPUT_SUBMIT_PAGECREATE = "create-page-form:create-page"; private static final String INPUT_PAGENAME = "create-page-form:pageName"; private static final String INPUT_PORTALNAME = "create-portal-form:name"; @@ -21,25 +24,25 @@ private final String LINK_PORTALS_ID = "link=*Portal Objects*"; private final String LINK_PORTAL_HOME = "_id8jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id11jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String TABLE_PORTAL_ADMIN = "//form[@id='_id33jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj']/table"; - private final String POR_TL_MAIN = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id43jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String POR_TL_SECURITY = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id48jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String POR_TL_PROPERTIES = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id52jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String POR_TL_THEME = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id56jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String POR_TL_RENAME = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id61jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String POR_TL_DELETE = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id66jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String POR_TL_MAKEDEF = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; + private final String TABLE_PORTAL_ADMIN = "obj-nav-form:portal-datatable"; + private final String POR_TL_MAIN = "obj-nav-form:portal-datatable:{0}:object-iid-link"; + private final String POR_TL_SECURITY = "obj-nav-form:portal-datatable:{0}:security-link"; + private final String POR_TL_PROPERTIES = "obj-nav-form:portal-datatable:{0}:prop-link"; + private final String POR_TL_THEME = "obj-nav-form:portal-datatable:{0}:theme-link"; + private final String POR_TL_RENAME = "obj-nav-form:portal-datatable:{0}:rename"; + private final String POR_TL_DELETE = "obj-nav-form:portal-datatable:{0}:delete"; + private final String POR_TL_MAKEDEF = "obj-nav-form:portal-datatable:{0}:default-link"; - private final String TABLE_PORTALPAGE_ADMIN = "//form[@id='_id64jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj']/table"; - private final String PAG_TL_MAIN = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id75jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String PAG_TL_LAYOUT = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id80jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String PAG_TL_SECURITY = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id84jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String PAG_TL_PROPERTIES = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id88jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String PAG_TL_THEME = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id92jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String PAG_TL_RENAME = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id96jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String PAG_TL_DISPLAY = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id100jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String PAG_TL_DELETE = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id105jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String PAG_TL_MAKEDEF = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id110jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; + private final String TABLE_PORTALPAGE_ADMIN = "obj-nav-form:pages-datatable"; + private final String PAG_TL_MAIN = "obj-nav-form:pages-datatable:{0}:object-link"; + private final String PAG_TL_LAYOUT = "obj-nav-form:pages-datatable:{0}:edit-page-layout"; + private final String PAG_TL_SECURITY = "obj-nav-form:pages-datatable:{0}:security-link"; + private final String PAG_TL_PROPERTIES = "obj-nav-form:pages-datatable:{0}:prop-link"; + private final String PAG_TL_THEME = "obj-nav-form:pages-datatable:{0}:theme-link"; + private final String PAG_TL_RENAME = "obj-nav-form:pages-datatable:{0}:rename-link_1"; + private final String PAG_TL_DISPLAY = "obj-nav-form:pages-datatable:{0}:rename-display"; + private final String PAG_TL_DELETE = "obj-nav-form:pages-datatable:{0}:delete-link"; + private final String PAG_TL_MAKEDEF = "obj-nav-form:pages-datatable:{0}:default-link"; @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { @@ -93,8 +96,8 @@ selenium.click(MessageFormat.format(POR_TL_RENAME, r)); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.type("renameForm:newName", "AestPortal"); - selenium.click("renameForm:_id34jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"); + selenium.type(INPUT_RENAME_PORTAL, "AestPortal"); + selenium.click(SUBMIT_RENAME_PORTAL); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertFalse(selenium.isTextPresent("TestPortal")); @@ -123,7 +126,7 @@ Assert.assertTrue(selenium.isTextPresent("Delete portal")); Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this portal?")); selenium - .click("_id33jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id41jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"); + .click(SUBMIT_DELETE_PORTAL_CONF); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("TestDelete has successfully been destroyed"));