Author: vrockai Date: 2009-01-20 09:28:22 -0500 (Tue, 20 Jan 2009) New Revision: 12570 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java Log: single test fix Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-01-20 13:53:23 UTC (rev 12569) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-01-20 14:28:22 UTC (rev 12570) @@ -141,8 +141,8 @@ <echo message="Runing TestNG" /> <mkdir dir="test-output" /> - <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumTest" testname="${testname}"> - + <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumSingleTest" listeners="org.jboss.portal.test.selenium.JBossSeleniumTestListener"> + <classfileset dir="${test.build.dir}" includes="${testname}" /> <sysproperty key="browser" value="${browser}" /> <sysproperty key="screenshot" value="${screenshot}" /> 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 2009-01-20 13:53:23 UTC (rev 12569) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-01-20 14:28:22 UTC (rev 12570) @@ -10,7 +10,7 @@ public class PortletInstancesTestCase extends JBossPortalSeleniumTestCase { - private static final String TAB_PORTLET_INSTANCES = "instancesTable2"; + private static final String TAB_PORTLET_INSTANCES = "//table[contains(@id,'instancesTable2')]"; private static final String UL_PAGINATOR = "//ul[@class='pagination property-container']"; private static final String SUBMIT_SECURITY_UPDATE = "//input[contains(@id,'common-edit-security-form:update')]"; private static final String SUBMIT_SECURITY_CANCEL = "//input[contains(@id,'common-edit-security-form:cancel')]"; @@ -131,7 +131,7 @@ @Test(enabled = true) public void testSecure() { String instance_name = "JSPPortletInstance"; - String table = TAB_PORTLET_INSTANCES; + //String table = TAB_PORTLET_INSTANCES; // selenium.click(LINK_20_PAGE); // selenium.waitForPageToLoad(PAGE_LOAD); @@ -140,7 +140,7 @@ int r = traversePortlets(instance_name,0); selenium.click(MessageFormat.format(LNK_SEC_BUTTON, r)); - selenium.waitForPageToLoad("30000"); + selenium.waitForPageToLoad(PAGE_LOAD); selenium.click("//input[contains(@name,'common-edit-security-form:cars_2')]"); selenium.click("//input[contains(@name,'common-edit-security-form:cars_1')]"); selenium.click("//input[contains(@name,'common-edit-security-form:cars_0')]"); @@ -148,10 +148,10 @@ selenium.click("//input[contains(@name,'common-edit-security-form:cars_1') and @value='admin']"); selenium.click("//input[contains(@name,'common-edit-security-form:cars_2') and @value='admin']"); selenium.click(SUBMIT_SECURITY_UPDATE); - selenium.waitForPageToLoad("30000"); + selenium.waitForPageToLoad(PAGE_LOAD); selenium.open("/portal/auth/portal/default/"); - selenium.waitForPageToLoad("30000"); + selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("Greetings !")); // then cancel @@ -164,16 +164,16 @@ r = traversePortlets(instance_name,0); selenium.click(MessageFormat.format(LNK_SEC_BUTTON, r)); - selenium.waitForPageToLoad("30000"); + selenium.waitForPageToLoad(PAGE_LOAD); 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_CANCEL); - selenium.waitForPageToLoad("30000"); + selenium.waitForPageToLoad(PAGE_LOAD); selenium.open("/portal/auth/portal/default/"); - selenium.waitForPageToLoad("30000"); + selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("Greetings !")); // then really stop the greetings portlet @@ -184,17 +184,17 @@ //r = findTableRow(table, instance_name, 0); r = traversePortlets(instance_name,0); selenium.click(MessageFormat.format(LNK_SEC_BUTTON, r)); - selenium.waitForPageToLoad("30000"); + selenium.waitForPageToLoad(PAGE_LOAD); 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"); + selenium.waitForPageToLoad(PAGE_LOAD); selenium.open("/portal/auth/portal/default/"); - selenium.waitForPageToLoad("30000"); + selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertFalse(selenium.isTextPresent("Greetings !")); }