Author: vrockai Date: 2009-03-16 10:21:17 -0400 (Mon, 16 Mar 2009) New Revision: 13036 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/EndToEndBeaPortlet.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml Log: test fixes 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-03-16 11:30:02 UTC (rev 13035) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-03-16 14:21:17 UTC (rev 13036) @@ -19,8 +19,6 @@ private final String LINK_WEATHER_PORTLET = getProp(casePfx + "link.weather.portlet", "link=*WeatherPortlet*"); private final String LINK_PORTL2 = getProp(casePfx + "link.portl2", "link=*Who's online portlet*"); private final String LINK_PORTL1 = getProp(casePfx + "link.portl1", "link=*Welcome portlet*"); - // private final String OPT_PORTL2 = - // getProp(casePfx+"opt.portl2","CurrentUsersPortletWindow"); private final String OPT_PORTL1 = getProp(casePfx + "opt.portl1", "JSPPortletWindow"); private final String SEL_CONTENT_TYPE = getProp(casePfx + "sel.content.type", "//select[contains(@id,'contentTypesForm:instanceId')]"); private final String SUB_DEL_FROM_CENTER_REGION = getProp(casePfx + "sub.del.from.center.region", "//input[contains(@id,'layoutForm:l_center')]"); @@ -35,7 +33,6 @@ private final String INP_PAGENAME = getProp(casePfx + "inp.pagename", "//input[contains(@id,':pageName')]"); private final String SUB_CREATEPAGE = getProp(casePfx + "sub.createpage", "//form[contains(@id,'j_id3')]/input[@type='submit']"); private final String SEL_LAYOUT = getProp(casePfx + "sel.layout", "//select[contains(@id,'dashboardLayoutForm:layoutSelector')]"); - private final String SEL_THEME = getProp(casePfx + "sel.theme", "//select[contains(@id,'dashboardThemeForm:themeSelector')]"); private final String SUB_THEMESEL = getProp(casePfx + "sub.themesel", "//form[contains(@id,'dashboardThemeForm')]/input[@type='submit']"); 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-03-16 11:30:02 UTC (rev 13035) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-03-16 14:21:17 UTC (rev 13036) @@ -13,12 +13,10 @@ @Test(groups = {"end2end"}, enabled = true, description = "Creating of new portal with content.") public class EndToEndBeaPortlet extends JBossPortalSeleniumTestCase { - - private static final String SUB_VIEW_PORTLETS = "//input[contains(@id,'definition-form:view-portlets')]"; - - private static final String SEL_CONS_TYPE = "//select[contains(@id,'definition-form:menu')]"; - public static String casePfx = "e2e.wsrp."; + + private final String SUB_VIEW_PORTLETS = "//input[contains(@id,'definition-form:view-portlets')]"; + public final String SEL_CONS_TYPE = "//select[contains(@id,'definition-form:menu')]"; private final String ADR_HOME = getProp(casePfx+"adr.home","portal/auth/portal/default"); private final String INP_CONSUMER_NAME = getProp(casePfx+"inp.consumer.name","//input[contains(@id,'edit-cons-form:id')]"); @@ -89,20 +87,21 @@ /// def - private static final String T_LINK_PREF = "//a[contains(@id,''def-list:portlet-pref-{0}'')]"; - 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')]"; - private static final String SELECT_PROVIDER = "//select[contains(@id,'definition-form:menu')]"; - private static final String TABLE_PORTLET = "//form[contains(@id,'def-list')]/table"; - private static final String LINK_NAME_ADMIN_PORT = "//a[contains(@id,'common-show-portlet-detail-form:field1:select')]"; - private static final String LINK_ADMIN_PORT = "//a[contains(@id,'def-list:portlet-def-0')]"; - private static final String LINK_ADMIN = "link=Admin"; - 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')]"; + private final String T_LINK_PREF = "//a[contains(@id,''def-list:portlet-pref-{0}'')]"; + private final String SUBMIT_CREATE_INST = "//input[contains(@name,'add_instance_form:j_id19')]"; + private final String INPUT_INSTANCE_NAME = "//input[contains(@id,'add_instance_form:instanceId')]"; + private final String T_LINK_CREATE = "//a[contains(@id,''def-list:create-instance-{0}'')]"; + private final String SUBMIT_PROVIDER_VIEW = "//input[contains(@id,'definition-form:view-portlets')]"; + private final String SELECT_PROVIDER = "//select[contains(@id,'definition-form:menu')]"; + private final String TABLE_PORTLET = "//form[contains(@id,'def-list')]/table"; + private final String LINK_NAME_ADMIN_PORT = "//a[contains(@id,'common-show-portlet-detail-form:field1:select')]"; + private final String LINK_ADMIN_PORT = "//a[contains(@id,'def-list:portlet-def-0')]"; + private final String LINK_ADMIN = "link=Admin"; + private final String LINK_TAB_PD = "//a[contains(@id,'admin-subtab-form:portlet-def-link')]"; + private final String LINK_PD_MAIN = "//a[contains(@id,'man-form:def-link')]"; public static String WSRP_CONSUMER_TABLE = "//table[contains(@id,':consumer-list-form:consumersList')]"; + @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { logoutIfPossible(); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-03-16 11:30:02 UTC (rev 13035) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-03-16 14:21:17 UTC (rev 13036) @@ -366,6 +366,7 @@ # EndToEndBeaPortlet +e2e.wsrp.adr.home=portal/auth/portal/default e2e.wsrp.inp.consumer.name=//input[contains(@id,'edit-cons-form:id')] e2e.wsrp.submit.refresh.cancel=//a[contains(@id,'edit-cons-form:list-cons-link')] e2e.wsrp.submit.prod.save=//input[contains(@id,'producer-form:save-producer')] Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-16 11:30:02 UTC (rev 13035) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-16 14:21:17 UTC (rev 13036) @@ -119,7 +119,7 @@ Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):10102")); openAndWait("/portal/auth/portal/default/Coordination+Samples?zipcode=10103"); - Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):10102")); + Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):null")); Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):10103")); } @@ -210,8 +210,8 @@ Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):222333")); openAndWait("/portal/auth/portal/default/Coordination+Samples?aliasBindDelete=222334"); - Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):222333")); - Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):222333")); + Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):null")); + Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):null")); } @Test(enabled = true) @@ -263,9 +263,13 @@ Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):222333")); Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):222333")); + openAndWait("/portal/auth/portal/default/Coordination+Samples?aliasBingRename=222334"); + Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):null")); + Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):null")); + openAndWait("/portal/auth/portal/default/Coordination+Samples?aliasBindWasRenamed=222334"); Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):222334")); - Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):222333")); + Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):null")); } @Test(enabled = true) Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-03-16 11:30:02 UTC (rev 13035) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-03-16 14:21:17 UTC (rev 13036) @@ -88,16 +88,16 @@ <class name="org.jboss.portal.test.selenium.cms.CMSArchiveUploadTestCase"></class></classes> </test> - <test name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase" + <test name="org.jboss.portal.test.selenium.EndToEndBeaPortlet" verbose="2" annotations="JDK"> <classes> - <class name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase"></class></classes> + <class name="org.jboss.portal.test.selenium.EndToEndBeaPortlet"></class></classes> </test> - <test name="org.jboss.portal.test.selenium.EndToEndBeaPortlet" + <test name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase" verbose="2" annotations="JDK"> <classes> - <class name="org.jboss.portal.test.selenium.EndToEndBeaPortlet"></class></classes> + <class name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase"></class></classes> </test> <listeners>