Author: vrockai Date: 2008-10-24 08:03:56 -0400 (Fri, 24 Oct 2008) New Revision: 12163 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java Log: new tests fixes Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-10-23 20:04:16 UTC (rev 12162) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-10-24 12:03:56 UTC (rev 12163) @@ -10,26 +10,26 @@ public class DashboardsTestCase extends JBossPortalSeleniumTestCase { - private static final String T_DH_SUB_UPDATE = "//input[contains(@id,'common-edit-theme-form:_id125jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj')]"; - private static final String T_DH_SEL_RENDERSET = "//input[contains(@id,'common-edit-theme-form:renderSet')]"; - private static final String T_DH_SEL_THEME = "//input[contains(@id,'common-edit-theme-form:theme')]"; - private static final String T_DH_SEL_LAYOUT = "//input[contains(@id,'common-edit-theme-form:layout')]"; - private static final String T_PA_SUB_UPDATE = "//input[contains(@id,'common-edit-page-error-form:update_2')]"; - private static final String T_PO_SUB_UPDATE = "//input[contains(@id,'common-edit-portal-error-form:update_1')]"; + private static final String T_DH_SUB_UPDATE = "//form[contains(@id,'common-edit-theme-form')]/input[@type='submit']"; + private static final String T_DH_SEL_RENDERSET = "//select[contains(@id,'common-edit-theme-form:renderSet')]"; + private static final String T_DH_SEL_THEME = "//select[contains(@id,'common-edit-theme-form:theme')]"; + private static final String T_DH_SEL_LAYOUT = "//select[contains(@id,'common-edit-theme-form:layout')]"; + private static final String T_PA_SUB_UPDATE = "//input[contains(@id,'common-edit-page-error-form:update')]"; + private static final String T_PO_SUB_UPDATE = "//input[contains(@id,'common-edit-portal-error-form:update')]"; private static final String T_PA_INP_PAGEADD = "//input[contains(@id,'common-edit-page-error-form:page-res-select')]"; private static final String T_PO_INP_PAGEADD = "//input[contains(@id,'common-edit-portal-error-form:portal-res-input')]"; - private static final String T_PA_SEL_PNF = "//input[contains(@id,'common-edit-page-error-form:page-not-found-select')]"; - private static final String T_PA_SEL_INTERN = "//input[contains(@id,'common-edit-page-error-form:page-internal-select')]"; - private static final String T_PA_SEL_ERROR = "//input[contains(@id,'common-edit-page-error-form:page-error-select')]"; - private static final String T_PA_SEL_CONTROL = "//input[contains(@id,'common-edit-page-error-form:page-control-select')]"; - private static final String T_PA_SEL_ACCESS = "//input[contains(@id,'common-edit-page-error-form:page-access-select')]"; - private static final String T_PO_SEL_PNF = "//input[contains(@id,'common-edit-portal-error-form:portal-not-found-select')]"; - private static final String T_PO_SEL_UNAVAIL = "//input[contains(@id,'common-edit-portal-error-form:portal-unavail-select')]"; - private static final String T_PO_SEL_ACCESS = "//input[contains(@id,'common-edit-portal-error-form:portal-access-select')]"; + private static final String T_PA_SEL_PNF = "//select[contains(@id,'common-edit-page-error-form:page-not-found-select')]"; + private static final String T_PA_SEL_INTERN = "//select[contains(@id,'common-edit-page-error-form:page-internal-select')]"; + private static final String T_PA_SEL_ERROR = "//select[contains(@id,'common-edit-page-error-form:page-error-select')]"; + private static final String T_PA_SEL_CONTROL = "//select[contains(@id,'common-edit-page-error-form:page-control-select')]"; + private static final String T_PA_SEL_ACCESS = "//select[contains(@id,'common-edit-page-error-form:page-access-select')]"; + private static final String T_PO_SEL_PNF = "//select[contains(@id,'common-edit-portal-error-form:portal-not-found-select')]"; + private static final String T_PO_SEL_UNAVAIL = "//select[contains(@id,'common-edit-portal-error-form:portal-unavail-select')]"; + private static final String T_PO_SEL_ACCESS = "//select[contains(@id,'common-edit-portal-error-form:portal-access-select')]"; private static final String SUBMIT_UPDATE_VALUE = "//input[contains(@id,'common-manage-prop-form:update')]"; private static final String TABLE_PROPS = "//table[contains(@id,'common-manage-prop-form:prop-data-table')]"; - private static final String T_PROPS_INPUT_VALUE = "//a[contains(@id,'common-manage-prop-form:prop-data-table:{0}:prop-value-input')]"; - private static final String T_PROPS_LINK_DEL = "//a[contains(@id,'common-manage-prop-form:prop-data-table:{0}:delete')]"; + private static final String T_PROPS_INPUT_VALUE = "//input[contains(@id,''common-manage-prop-form:prop-data-table:{0}:prop-value-input'')]"; + private static final String T_PROPS_LINK_DEL = "//a[contains(@id,''common-manage-prop-form:prop-data-table:{0}:delete'')]"; private static final String TABLE_PA_ERR = "//form[@id='common-edit-page-error-form']/table"; private static final String TABLE_PO_ERR = "//form[@id='common-edit-portal-error-form']/table"; Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2008-10-23 20:04:16 UTC (rev 12162) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2008-10-24 12:03:56 UTC (rev 12163) @@ -10,18 +10,18 @@ public class PortletDefinitionsTestCase extends JBossPortalSeleniumTestCase{ - private static final String T_LINK_PREF = "def-list:portlet-pref-{0}"; - private static final String SUBMIT_CREATE_INST = "add_instance_form:_id19jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private static final String INPUT_INSTANCE_NAME = "add_instance_form:instanceId"; - private static final String T_LINK_CREATE = "def-list:create-instance-{0}"; - private static final String SUBMIT_PROVIDER_VIEW = "definition-form:view-portlets"; - private static final String SELECT_PROVIDER = "definition-form:menu"; - private static final String TABLE_PORTLET = "//form[@id='def-list']/table"; - private static final String LINK_NAME_ADMIN_PORT = "common-show-portlet-detail-form:field1:select"; - private static final String LINK_ADMIN_PORT = "def-list:portlet-def-0"; + private static final String T_LINK_PREF = "//a[contains(@id,''def-list:portlet-pref-{0}'')]"; + private static final String SUBMIT_CREATE_INST = "//input[contains(@id,'add_instance_form:_id19jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj')]"; + 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 = "admin-subtab-form:portlet-def-link"; - private static final String LINK_PD_MAIN = "man-form:def-link"; + 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')]"; @BeforeMethod(groups = { "log" })