Author: vrockai Date: 2008-10-15 07:39:37 -0400 (Wed, 15 Oct 2008) New Revision: 12065 Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/selenium-rc-server/user-extensions.js branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml Log: testcases 2.6 fixes Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/selenium-rc-server/user-extensions.js =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/selenium-rc-server/user-extensions.js 2008-10-14 21:07:55 UTC (rev 12064) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/selenium-rc-server/user-extensions.js 2008-10-15 11:39:37 UTC (rev 12065) @@ -50,14 +50,18 @@ var index = allText.indexOf(expectedTextValues[i]); var nextIndex = allText.indexOf(expectedTextValues[i+1]); if (index == -1) { - assert.fail("'" + expectedTextValues[i] + "' not found."); + return false; + //assert.fail("'" + expectedTextValues[i] + "' not found."); } if (nextIndex == -1) { - assert.fail("'" + expectedTextValues[i+1] + "' not found."); + return false; + //assert.fail("'" + expectedTextValues[i+1] + "' not found."); } if (index > nextIndex) { - assert.fail("'" + expectedTextValues[i+1] + "' found before '" + expectedTextValues[i] + "'"); + return false; + //assert.fail("'" + expectedTextValues[i+1] + "' found before '" + expectedTextValues[i] + "'"); } } + return true; } Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-10-14 21:07:55 UTC (rev 12064) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-10-15 11:39:37 UTC (rev 12065) @@ -104,6 +104,21 @@ openAndWait("/portal/"); Assert.assertFalse(selenium.isTextPresent("Greetings !")); + + selenium.click("link=Admin"); + selenium.waitForPageToLoad(PAGE_LOAD); + + clickIfVisible(TAB_PORTALOBJ_ID); + + final String portalDef = "default"; + r = findTableRow(TABLE_PORTAL_ADMIN, portalDef, 0) - 1; + + clickAndWait(MessageFormat.format(POR_TL_MAKEDEF, r)); + + openAndWait("/portal/"); + Assert.assertTrue(selenium.isTextPresent("Greetings !")); + + } @Test(enabled = true) Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-10-14 21:07:55 UTC (rev 12064) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-10-15 11:39:37 UTC (rev 12065) @@ -55,12 +55,17 @@ public void testAddName() { selenium.click(LINK_COUNTPORT); selenium.waitForPageToLoad(PAGE_LOAD); + selenium.captureScreenshot("m1.jpg"); selenium.select(SELECT_LANGUAGE, "label=Czech"); + selenium.captureScreenshot("m2.jpg"); final String name = "Administracny"; selenium.type(INPUT_NAME, name); + selenium.captureScreenshot("m3.jpg"); selenium.click(SUBMIT_MODIFY_NAME); selenium.waitForPageToLoad(PAGE_LOAD); + selenium.captureScreenshot("m4.jpg"); Assert.assertTrue(findTableRow(TABLE_DISPNAMES, name, 1) >= 0); + selenium.captureScreenshot("m5.jpg"); } @Test(enabled = true) Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml 2008-10-14 21:07:55 UTC (rev 12064) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml 2008-10-15 11:39:37 UTC (rev 12065) @@ -1,6 +1,6 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <suite name="SeleniumTest"> - +<!-- --> <test verbose="2" name="org.jboss.portal.test.selenium.UserLoginTestCase" annotations="JDK"> <classes> <class name="org.jboss.portal.test.selenium.UserLoginTestCase"/> @@ -15,16 +15,9 @@ <classes> <class name="org.jboss.portal.test.selenium.IdentityAdminTestCase"></class></classes> </test> -<!-- - <test name="org.jboss.portal.test.selenium.IdentityAdminTestCase - SingleLogin" - verbose="2" annotations="JDK"> - <groups> - <run> - <exclude name="log"></exclude></run></groups> - <classes> - <class name="org.jboss.portal.test.selenium.IdentityAdminTestCase"></class></classes> - </test> ---> + + + <test name="org.jboss.portal.test.selenium.PortletUserCreationTestCase" verbose="2" annotations="JDK"> <classes>