Author: vrockai Date: 2008-11-14 04:51:59 -0500 (Fri, 14 Nov 2008) New Revision: 12294 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/lib/selenium-java-client-driver.jar branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java Log: new selenium version Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/lib/selenium-java-client-driver.jar =================================================================== (Binary files differ) Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-11-13 22:35:54 UTC (rev 12293) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-11-14 09:51:59 UTC (rev 12294) @@ -13,6 +13,8 @@ private static final String SEL_CONTENT_TYPE = "//select[contains(@id,'contentTypesForm:instanceId')]"; private static final String SUB_DEL_FROM_CENTER_REGION = "//input[contains(@id,'layoutForm:l_center')]"; + private static final String SUB_DOWN_CENTER_REGION = "//input[contains(@id,'layoutForm:d_center')]"; + private static final String SUB_UP_CENTER_REGION = "//input[contains(@id,'layoutForm:u_center')]"; private static final String SEL_CENTER_REGION = "//select[contains(@id,'layoutForm:selectMany_center')]"; private static final String SUB_ADDCENTER = "//input[contains(@id,'layoutForm:a_center')]"; private static final String SUB_ADDLEFT = "//input[contains(@id,'layoutForm:a_left')]"; @@ -205,6 +207,29 @@ } + @Test(enabled = true, dependsOnMethods = { "testCreatePage" , "testMovePortlet"}) + public void testReorder() { + final String pageName = "DashMovePage"; + + selenium.click(LNK_DASHBOARD); + selenium.waitForPageToLoad(PAGE_LOAD); + selenium.click(LNK_CONFIGURE_DASHBOARD); + selenium.waitForPageToLoad(PAGE_LOAD); + selectIfNotSelected(SEL_PAGE,pageName); + + selenium.addSelection(SEL_CENTER_REGION, "label=ExceptionPortletWindow"); + selenium.click(SUB_DOWN_CENTER_REGION); + selenium.waitForPageToLoad(PAGE_LOAD); + + selenium.click(LNK_DASHBOARD); + selenium.waitForPageToLoad(PAGE_LOAD); + selenium.click("link="+pageName); + selenium.waitForPageToLoad(PAGE_LOAD); + + Assert.assertTrue(assertTextOrder("Current;Exception")); + Assert.assertFalse(assertTextOrder("Exception;Current")); + } + @Test(enabled = true, dependsOnMethods = { "testAddPortlet" }) public void testDeletePortlet() { @@ -328,13 +353,6 @@ selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("Alexandria"), "Previously selected portlet settings were changes after renaming of portal page."); - } - // TODO write an extension for checking of ordering of elements - @Test(enabled = false, dependsOnMethods = { "testCreatePage" }) - public void testReorder() { - - } - }