Author: vrockai Date: 2008-10-24 11:32:26 -0400 (Fri, 24 Oct 2008) New Revision: 12166 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java Log: portlet def testcases fix Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2008-10-24 14:39:14 UTC (rev 12165) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2008-10-24 15:32:26 UTC (rev 12166) @@ -11,7 +11,7 @@ public class PortletDefinitionsTestCase extends JBossPortalSeleniumTestCase{ private static final String T_LINK_PREF = "//a[contains(@id,''def-list:portlet-pref-{0}'')]"; - private static final String SUBMIT_CREATE_INST = "//input[contains(@id,'add_instance_form:_id19jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj')]"; + private static final String SUBMIT_CREATE_INST = "//input[contains(@name,'add_instance_form:j_id19')]"; private static final String INPUT_INSTANCE_NAME = "//input[contains(@id,'add_instance_form:instanceId')]"; private static final String T_LINK_CREATE = "//a[contains(@id,''def-list:create-instance-{0}'')]"; private static final String SUBMIT_PROVIDER_VIEW = "//input[contains(@id,'definition-form:view-portlets')]"; @@ -23,7 +23,6 @@ private static final String LINK_TAB_PD = "//a[contains(@id,'admin-subtab-form:portlet-def-link')]"; private static final String LINK_PD_MAIN = "//a[contains(@id,'man-form:def-link')]"; - @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { login("admin", "admin"); @@ -39,12 +38,11 @@ public void testShowInfo(){ selenium.click(LINK_ADMIN_PORT); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isTextPresent("Portlet Instance Information")); - Assert.assertTrue(selenium.isElementPresent(LINK_NAME_ADMIN_PORT)); + Assert.assertTrue(selenium.isTextPresent("Administration Portlet details ")); Assert.assertTrue(selenium.isTextPresent("Administration Portlet")); Assert.assertTrue(selenium.isTextPresent("Management Portlet")); Assert.assertTrue(selenium.isTextPresent("management,admin")); - Assert.assertTrue(selenium.isTextPresent("de it en")); + Assert.assertTrue(selenium.isTextPresent("Portlet Modes")); } @Test(enabled = true) @@ -54,11 +52,11 @@ selenium.click(MessageFormat.format(T_LINK_CREATE,r-1)); selenium.waitForPageToLoad(PAGE_LOAD); + selenium.type(INPUT_INSTANCE_NAME, "littleAdmin"); selenium.click(SUBMIT_CREATE_INST); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("littleAdmin portlet details")); - Assert.assertTrue(selenium.isTextPresent("Portlet Instance Information")); } @Test(enabled = true)