Author: vrockai Date: 2008-12-19 07:30:28 -0500 (Fri, 19 Dec 2008) New Revision: 12409 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java Log: portlet instance test fix Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-12-18 22:45:35 UTC (rev 12408) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-12-19 12:30:28 UTC (rev 12409) @@ -40,6 +40,9 @@ private static final String LINK_TAB_PI = "//a[contains(@id,'admin-subtab-form:portlet-instance-link')]"; private static final String LINK_PI_MAIN = "//a[contains(@id,'instance-form1:instance-link')]"; private static final String TABLE_DISPNAMES = "//table[contains(@id,'instance-display-form:locale-datatable')]"; + private static final String LNK_SEC_BUTTON = "//table[contains(@id,''instancesTable2'')]/tbody/tr[{0}]/td/table/tbody/tr/td/a[contains(@class,''Security'')]"; + //private static final String LNK_PREF_WELCOMEPORT = "//a[contains(@id,'security-JSPPortletInstance')]"; + @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { @@ -52,14 +55,6 @@ public void logoutAfterTest() { } - - @Test(enabled=true) - public void testGo() - { - selenium.setSpeed("2000"); - goToPI(); - Assert.assertTrue(selenium.isTextPresent("CoordinationPublicParametersPortletInstance1")); - } @Test(enabled = true) public void testAddName() { @@ -126,9 +121,15 @@ @Test(enabled = true) public void testSecure() { + String instance_name = "JSPPortletInstance"; + String table = "instancesTable2"; + selenium.click(LINK_20_PAGE); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.click(LINK_PREF_WELCOMEPORT); + + int r = findTableRow(table, instance_name, 0); + + selenium.click(MessageFormat.format(LNK_SEC_BUTTON, r)); selenium.waitForPageToLoad("30000"); selenium.click("//input[contains(@name,'common-edit-security-form:cars_2')]"); selenium.click("//input[contains(@name,'common-edit-security-form:cars_1')]"); @@ -147,8 +148,10 @@ goToPI(); selenium.click(LINK_20_PAGE); + selenium.waitForPageToLoad(PAGE_LOAD); - selenium.click(LINK_PREF_WELCOMEPORT); + r = findTableRow(table, instance_name, 0); + selenium.click(MessageFormat.format(LNK_SEC_BUTTON, r)); selenium.waitForPageToLoad("30000"); selenium.click("//input[contains(@name,'common-edit-security-form:cars_0')]"); selenium.click("//input[contains(@name,'common-edit-security-form:cars_1') and @value='admin']"); @@ -163,15 +166,17 @@ // then really stop the greetings portlet goToPI(); + selenium.setSpeed("5000"); selenium.click(LINK_20_PAGE); - selenium.waitForPageToLoad(PAGE_LOAD); - selenium.click(LINK_PREF_WELCOMEPORT); + selenium.waitForPageToLoad(PAGE_LOAD); + r = findTableRow(table, instance_name, 0); + selenium.click(MessageFormat.format(LNK_SEC_BUTTON, r)); selenium.waitForPageToLoad("30000"); - selenium.click("//input[contains(@name='common-edit-security-form:cars_0')]"); - selenium.click("//input[contains(@name='common-edit-security-form:cars_1') and @value='admin']"); - selenium.click("//input[contains(@name='common-edit-security-form:cars_0') and @value='admin']"); - selenium.click("//input[contains(@name='common-edit-security-form:cars_2') and @value='admin']"); - selenium.click("//input[contains(@name='common-edit-security-form:cars_1')]"); + selenium.click("//input[contains(@name,'common-edit-security-form:cars_0')]"); + selenium.click("//input[contains(@name,'common-edit-security-form:cars_1') and @value='admin']"); + selenium.click("//input[contains(@name,'common-edit-security-form:cars_0') and @value='admin']"); + selenium.click("//input[contains(@name,'common-edit-security-form:cars_2') and @value='admin']"); + selenium.click("//input[contains(@name,'common-edit-security-form:cars_1')]"); selenium.click(SUBMIT_SECURITY_UPDATE); selenium.waitForPageToLoad("30000");