Author: vrockai Date: 2008-09-24 12:12:39 -0400 (Wed, 24 Sep 2008) New Revision: 11970 Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java Log: some tests id corrections, increased the value for timeout Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-24 14:22:05 UTC (rev 11969) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-24 16:12:39 UTC (rev 11970) @@ -73,8 +73,6 @@ selenium.waitForPageToLoad(PAGE_LOAD); } - //System.out.println(selenium.isElementPresent("_id15jbpnsabcsnpbj:themeSelector")); - //System.out.println(selenium.getSelectedLabel("_id15jbpnsabcsnpbj:themeSelector")); Assert.assertEquals("renaissance", selenium.getSelectedLabel(SELECT_THEME)); } Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-24 14:22:05 UTC (rev 11969) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-24 16:12:39 UTC (rev 11970) @@ -9,7 +9,7 @@ public class JBossPortalSeleniumTestCase { protected Selenium selenium; - protected static final String PAGE_LOAD = "50000"; + protected static final String PAGE_LOAD = "150000"; @BeforeClass public void setupChromeForLogin() throws Exception { Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-24 14:22:05 UTC (rev 11969) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-24 16:12:39 UTC (rev 11970) @@ -34,9 +34,9 @@ private static final String INPUT_CACHEEXP = "edit-cons-form:cache"; private static final String SUBMIT_ADDPROP_INIT = "producer-form:add-reg-prop"; private static final String SUBMIT_ADDPROP = "producer-form:add-reg-prop"; - private static final String INPUT_PROPHINT = "producer-form:reg-properties:0:_id33jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"; - private static final String INPUT_PROPLABEL = "producer-form:reg-properties:0:_id30jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"; - private static final String INPUT_PROPNAME = "producer-form:reg-properties:0:_id24jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"; + private static final String INPUT_PROPHINT = "producer-form:reg-properties:0:hint"; + private static final String INPUT_PROPLABEL = "producer-form:reg-properties:0:label"; + private static final String INPUT_PROPNAME = "producer-form:reg-properties:0:name"; private static final String SUBMIT_CREATECONS = "createConsumer:createConsumerButton"; private static final String INPUT_CREATECONS = "createConsumer:consumerName"; private static final String ID_LINK_PRODCONF = "cons-temp-form:producer-link"; 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-09-24 14:22:05 UTC (rev 11969) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-09-24 16:12:39 UTC (rev 11970) @@ -11,19 +11,17 @@ @Test(groups = { "admin_portal" }, enabled = true, description = "Partal administrating.") public class AdminPortalTestCase extends JBossPortalSeleniumTestCase { - private static final String INPUT_SUBMIT_PAGECREATE = "_id65jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id67jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private static final String INPUT_PAGENAME = "_id65jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:pageName"; - private static final String INPUT_PORTALNAME = "_id33jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:name"; - private static final String INPUT_SUBMIT_CREATEPORTAL = "_id33jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id35jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; + private static final String INPUT_SUBMIT_PAGECREATE = "create-page-form:create-page"; + private static final String INPUT_PAGENAME = "create-page-form:pageName"; + private static final String INPUT_PORTALNAME = "create-portal-form:name"; + private static final String INPUT_SUBMIT_CREATEPORTAL = "create-portal-form:create-portal"; private final String TAB_PORTALOBJ_ID = "//div[@id='current']/a"; - // private final String LINK_PORTALS_ID = - // "_id12jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id15jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj" - // ; + private final String LINK_PORTALS_ID = "link=*Portal Objects*"; - private final String LINK_PORTAL_HOME = "_id12jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id15jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; + private final String LINK_PORTAL_HOME = "_id8jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id11jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String TABLE_PORTAL_ADMIN = "//form[@id='_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj']/table"; + private final String TABLE_PORTAL_ADMIN = "//form[@id='_id33jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj']/table"; private final String POR_TL_MAIN = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id43jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; private final String POR_TL_SECURITY = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id48jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; private final String POR_TL_PROPERTIES = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id52jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; @@ -32,7 +30,7 @@ private final String POR_TL_DELETE = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id66jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; private final String POR_TL_MAKEDEF = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; - private final String TABLE_PORTALPAGE_ADMIN = "//form[@id='_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj']/table"; + private final String TABLE_PORTALPAGE_ADMIN = "//form[@id='_id64jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj']/table"; private final String PAG_TL_MAIN = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id75jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; private final String PAG_TL_LAYOUT = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id80jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"; private final String PAG_TL_SECURITY = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id84jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";