Author: vrockai Date: 2009-01-13 15:50:30 -0500 (Tue, 13 Jan 2009) New Revision: 12490 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java Log: dashboard reorder fix 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 2009-01-13 18:07:42 UTC (rev 12489) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-01-13 20:50:30 UTC (rev 12490) @@ -16,6 +16,8 @@ private static final String LINK_WEATHER_PORTLET = "link=*WeatherPortlet*"; private static final String LINK_PORTL2 = "link=*Who's online portlet*"; private static final String LINK_PORTL1 = "link=*Welcome portlet*"; + private static final String OPT_PORTL2 = "CurrentUsersPortletWindow"; + private static final String OPT_PORTL1 = "JSPPortletWindow"; 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')]"; @@ -229,8 +231,8 @@ selenium.click("link="+pageName); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertFalse(assertTextOrder("Current;JSP")); - Assert.assertTrue(assertTextOrder("JSP;Current")); + Assert.assertFalse(assertTextOrder("Current;Greetings")); + Assert.assertTrue(assertTextOrder("Greetings;Current")); } @@ -245,7 +247,7 @@ wait(5000); selectIfNotSelected(SEL_PAGE,pageName); - selenium.addSelection(SEL_CENTER_REGION, "label=ExceptionPortletWindow"); + selenium.addSelection(SEL_CENTER_REGION, OPT_PORTL1); selenium.click(SUB_DOWN_CENTER_REGION); selenium.waitForPageToLoad(PAGE_LOAD); @@ -254,8 +256,8 @@ selenium.click("link="+pageName); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(assertTextOrder("Current;Exception")); - Assert.assertFalse(assertTextOrder("Exception;Current")); + Assert.assertFalse(assertTextOrder("Greetings;Current")); + Assert.assertTrue(assertTextOrder("Current;Greetings")); } @Test(enabled = true, dependsOnMethods = { "testAddPortlet" })