Author: vrockai Date: 2009-06-15 10:24:35 -0400 (Mon, 15 Jun 2009) New Revision: 13455 Removed: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/temp-testng-customsuite.xml Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java 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/EndToEndBeaPortlet.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java Log: [selenium] - fixing new wsrp interface issues Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java 2009-06-14 15:23:17 UTC (rev 13454) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java 2009-06-15 14:24:35 UTC (rev 13455) @@ -7,8 +7,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import com.sun.corba.se.impl.protocol.giopmsgheaders.Message; - /** * The Class Coordination Samples TestCase is responsible for testing of * coordination features of JBoss Portal using it's coordination samples page. 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-06-14 15:23:17 UTC (rev 13454) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-06-15 14:24:35 UTC (rev 13455) @@ -1,6 +1,7 @@ package org.jboss.portal.test.selenium; import org.testng.Assert; +import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -58,11 +59,12 @@ logoutIfPossible(); login("admin", "admin"); } - +/* @AfterMethod(groups = {"log"}) protected void logoutAfterTest() { + System.out.println("vilko"); } - +*/ /** * Simple drag and drop test processed on "user" dashboard. The greetings * portlet is moved from left to right column and the cms portlet is moved @@ -88,7 +90,6 @@ Assert.assertEquals(selenium.getText(SPAN_R1), "Greetings !"); } - /** * Creates a page. In Dashboard configuration a new page named * "DashTestPage" is created. The existence of the link (page) is then @@ -171,7 +172,6 @@ */ @Test(enabled = true, dependsOnMethods = {"testCreatePage"}) public void testUpdateTheme() { - // selenium.setSpeed("10000"); selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); @@ -205,7 +205,6 @@ */ @Test(enabled = true, dependsOnMethods = {"testCreatePage"}) public void testUpdateLayout() { - // selenium.setSpeed("10000"); selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); @@ -238,7 +237,6 @@ */ @Test(enabled = true, dependsOnMethods = {"testCreatePage"}) public void testAddPortlet() { - // selenium.setSpeed("10000"); selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); @@ -262,7 +260,6 @@ Assert.assertTrue(selenium.isTextPresent("Current users")); Assert.assertTrue(selenium.isTextPresent("Among them: * logged-in")); Assert.assertTrue(selenium.isTextPresent("[admin]")); - // selenium.setSpeed("0"); } /** Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-06-14 15:23:17 UTC (rev 13454) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-06-15 14:24:35 UTC (rev 13455) @@ -124,13 +124,13 @@ selenium.type(INPUT_CONSWSDL, "http://wsrp.bea.com:7001/producer/producer?WSDL"); selenium.click(SUBMIT_REFRESHSAVE); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isTextPresent("Refresh failed (probably because the registration information was not valid).")); + //Assert.assertTrue(selenium.isTextPresent("Refresh failed (probably because the registration information was not valid).")); Assert.assertTrue(selenium.isTextPresent("Missing value")); selenium.type(INPUT_CONS_REGVALUE, "public"); selenium.click(SUBMIT_CONS_REGVAL); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isTextPresent("Refresh was successful.")); + Assert.assertTrue(selenium.isTextPresent("configuration (active)")); selenium.click(SUBMIT_REFRESHFINAL); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent(consumerName)); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-06-14 15:23:17 UTC (rev 13454) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-06-15 14:24:35 UTC (rev 13455) @@ -109,13 +109,13 @@ selenium.type(INPUT_CONSWSDL, "http://wsrp.bea.com:7001/producer/producer?WSDL"); selenium.click(SUBMIT_REFRESHSAVE); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isTextPresent("Refresh failed (probably because the registration information was not valid).")); + //Assert.assertTrue(selenium.isTextPresent("Refresh failed (probably because the registration information was not valid).")); Assert.assertTrue(selenium.isTextPresent("Missing value")); selenium.type(INPUT_CONS_REGVALUE, "public"); selenium.click(SUB_CONS_REGVAL); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isTextPresent("Refresh was successful.")); + Assert.assertTrue(selenium.isTextPresent("configuration (active)")); selenium.click(SUB_REFRESHFINAL); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("BEA")); @@ -433,6 +433,7 @@ Assert.assertTrue(selenium.isTextPresent("must be a number between")); + selenium.setSpeed("5000"); selenium.type(INP_PRODID, XSS_STR1); selenium.type(INPUT_CACHEEXP, "600"); selenium.type(INPUT_CONSWSDL, "http://wsrp.bea.com:7001/producer/producer?WSDL"); @@ -464,13 +465,13 @@ selenium.type("//input[contains(@id,'producer-form:registrationPolicy')]", XSS_STR1); selenium.click(SUB_PROD_SAVE); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isTextPresent("Couldn't find policy class")); + Assert.assertTrue(selenium.isTextPresent("is an invalid class nam")); goToProducers(); selenium.type("//input[contains(@id,'producer-form:validator')]", XSS_STR1); selenium.click(SUB_PROD_SAVE); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isTextPresent("Couldn't find policy class")); + Assert.assertTrue(selenium.isTextPresent("is an invalid class nam")); // properties selenium.open("/portal/"); Deleted: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/temp-testng-customsuite.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/temp-testng-customsuite.xml 2009-06-14 15:23:17 UTC (rev 13454) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/temp-testng-customsuite.xml 2009-06-15 14:24:35 UTC (rev 13455) @@ -1,8 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="SeleniumTest"> - <test verbose="2" name="org.jboss.portal.test.selenium.AdminTest" annotations="JDK"> - <classes> - <class name="org.jboss.portal.test.selenium.AdminTest"/> - </classes> - </test> -</suite>