[portal-commits] JBoss Portal SVN: r12837 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium and 1 other directories.

Author: vrockai Date: 2009-02-19 06:43:13 -0500 (Thu, 19 Feb 2009) New Revision: 12837 Added: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 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/locator.properties branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/usecaseng.xml Log: bea portlet and run.sh Added: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh (rev 0) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-19 11:43:13 UTC (rev 12837) @@ -0,0 +1,28 @@ +#!/bin/bash + +echo "Firefox bin location: $2" + +ant clean + +if [ $1 = "test" ]; then + ant -f build.xml copyApps + ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" +fi + +if [ $1 = "end2end" ]; then + ant -f build.xml copyApps + ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" +fi + +if [ $1 = "perf" ]; then + ant -f build-local.xml copyApps + ant -f build-local.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" +fi + +if [ $1 = "selenium" ]; then + ant -f build-local.xml run-src +fi + +if [ $1 = "single" ]; then + ant -f build-local.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3" +fi Property changes on: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh ___________________________________________________________________ Name: svn:executable + * Added: 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 (rev 0) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-02-19 11:43:13 UTC (rev 12837) @@ -0,0 +1,233 @@ +package org.jboss.portal.test.selenium; + +import java.text.MessageFormat; + +import org.testng.Assert; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a> + */ +@Test(groups = {"end2end"}, enabled = true, description = "Creating of new portal with content.") +public class EndToEndBeaPortlet extends JBossPortalSeleniumTestCase { + + private static final String SUB_VIEW_PORTLETS = "_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:definition-form:view-portlets"; + + private static final String SEL_CONS_TYPE = "_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:definition-form:menu"; + + public static String casePfx = "e2e.wsrp."; + + private final String INP_CONSUMER_NAME = getProp(casePfx+"inp.consumer.name","//input[contains(@id,'edit-cons-form:id')]"); + private final String SUBMIT_REFRESH_CANCEL = getProp(casePfx+"submit.refresh.cancel","//a[contains(@id,'edit-cons-form:list-cons-link')]"); + private final String SUBMIT_PROD_SAVE = getProp(casePfx+"submit.prod.save","//input[contains(@id,'producer-form:save-producer')]"); + private final String SUBMIT_CONSDEL_CONF = getProp(casePfx+"submit.consdel.conf","//a[contains(@id,'confirm-delete-form:destroy-link')]"); + + private final String SUBMIT_CONS_REGVAL = getProp(casePfx+"submit.cons.regval","//input[contains(@id,'edit-cons-form:refresh-cons-link')]"); + private final String SUBMIT_REFRESHFINAL = getProp(casePfx+"submit.refreshfinal","//input[contains(@id,'edit-cons-form:refresh-cons-link')]"); + + private final String INPUT_CONS_REGVALUE = getProp(casePfx+"input.cons.regvalue","//input[contains(@id,'edit-cons-form:existingProps:0:prop-value-input')]"); + private final String SUBMIT_REFRESHSAVE = getProp(casePfx+"submit.refreshsave","//input[contains(@id,'edit-cons-form:refresh-cons-link')]"); + private final String INPUT_CONSWSDL = getProp(casePfx+"input.conswsdl","//input[contains(@id,'edit-cons-form:wsdl')]"); + private final String INPUT_CACHEEXP = getProp(casePfx+"input.cacheexp","//input[contains(@id,'edit-cons-form:cache')]"); + private final String SUBMIT_ADDPROP_INIT = getProp(casePfx+"submit.addprop.init","//a[contains(@id,'producer-form:add-reg-prop')]"); + private final String SUBMIT_ADDPROP = getProp(casePfx+"submit.addprop","//a[contains(@id,'producer-form:add-reg-prop')]"); + private final String INPUT_PROPHINT = getProp(casePfx+"input.prophint","//input[contains(@id,'producer-form:reg-properties:0:hint')]"); + private final String INPUT_PROPLABEL = getProp(casePfx+"input.proplabel","//input[contains(@id,'producer-form:reg-properties:0:label')]"); + private final String INPUT_PROPNAME = getProp(casePfx+"input.propname","//input[contains(@id,'producer-form:reg-properties:0:name')]"); + private final String SUBMIT_CREATECONS = getProp(casePfx+"submit.createcons","//input[contains(@id,'createConsumer:createConsumerButton')]"); + private final String INPUT_CREATECONS = getProp(casePfx+"input.createcons","//input[contains(@id,'createConsumer:consumerName')]"); + private final String ID_LINK_PRODCONF = getProp(casePfx+"id.link.prodconf","//a[contains(@id,'cons-temp-form:producer-link')]"); + private final String ID_LINK_CONSCONF = getProp(casePfx+"id.link.consconf","//a[contains(@id,'producer-temp-form:consumersTab')]"); + private final String LINK_CONSUMER_HOME =getProp(casePfx+"link.consumer.home","//a[contains(@id,'cons-temp-form1:list-cons-link')]"); + + private final String LINK_T_CONS_CON=getProp(casePfx+"link.t.cons.con","//a[contains(@id,''consumer-list-form:consumersList:{0}:configure'')]"); + private final String LINK_T_CONS_REF=getProp(casePfx+"link.t.cons.ref","//a[contains(@id,''consumer-list-form:consumersList:{0}:refresh'')]"); + private final String LINK_T_CONS_ACT=getProp(casePfx+"link.t.cons.act","//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')]"); + private final String LINK_T_CONS_DEA=getProp(casePfx+"link.t.cons.dea","//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')]"); + private final String LINK_T_CONS_REG=getProp(casePfx+"link.t.cons.reg","//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')]"); + private final String LINK_T_CONS_DER=getProp(casePfx+"link.t.cons.der","//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')]"); + private final String LINK_T_CONS_DEL=getProp(casePfx+"link.t.cons.del","//a[contains(@id,''consumer-list-form:consumersList:{0}:delete'')]"); + + /// + + public final String SEL_PORTLET_TYPE = getProp(casePfx+"sel.portlet.type","_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:windowForm:instanceId"); + private final String SUB_LAYOUT_ADD_CENTER = getProp(casePfx+"sub.layout.add.center","//input[contains(@id,'layoutForm:a_center')]"); + private final String INP_WINDOW_NAME = getProp(casePfx+"inp.window.name","//input[contains(@id,'windowForm:windowName')]"); + private final String SUB_RENAME_PORTAL = getProp(casePfx+"sub.rename.portal","//input[contains(@id,'renameForm:rename')]"); + private final String INP_RENAME_PORTAL = getProp(casePfx+"inp.rename.portal","//input[contains(@id,'renameForm:newName')]"); + private final String SUB_DELETE_PORTAL_CONF = getProp(casePfx+"sub.delete.portal.conf","//input[contains(@id,'delete-view:confirm-form:delete')]"); + private final String INP_SUBMIT_PAGECREATE = getProp(casePfx+"inp.submit.pagecreate","//input[contains(@id,'create-page-form:create-page')]"); + private final String INP_PAGENAME = getProp(casePfx+"inp.pagename","//input[contains(@id,'create-page-form:pageName')]"); + private final String INP_PORTALNAME = getProp(casePfx+"inp.portalname","//input[contains(@id,'create-portal-form:name')]"); + private final String INP_SUBMIT_CREATEPORTAL = getProp(casePfx+"inp.submit.createportal","//input[contains(@id,'create-portal-form:create-portal')]"); + private final String TAB_PORTALOBJ_ID = getProp(casePfx+"tab.portalobj.id","Link=Admin"); + private final String LNK_PORTALS_ID = getProp(casePfx+"lnk.portals.id","link=*Portal Objects*"); + private final String LNK_PORTAL_HOME = getProp(casePfx+"lnk.portal.home","//a[contains(@id,'obj-temp-form:object-link-0')]"); + private final String TBL_PORTAL_ADMIN = getProp(casePfx+"tbl.portal.admin","//table[contains(@id,'obj-nav-form:portal-datatable')]"); + private final String POR_TL_MAIN = getProp(casePfx+"por.tl.main","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:object-iid-link'')]"); + private final String POR_TL_SECURITY = getProp(casePfx+"por.tl.security","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:security-link'')]"); + private final String POR_TL_PROPERTIES = getProp(casePfx+"por.tl.properties","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:prop-link'')]"); + private final String POR_TL_THEME = getProp(casePfx+"por.tl.theme","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:theme-link'')]"); + private final String POR_TL_RENAME = getProp(casePfx+"por.tl.rename","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:rename'')]"); + private final String POR_TL_DELETE = getProp(casePfx+"por.tl.delete","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:delete'')]"); + private final String POR_TL_MAKEDEF = getProp(casePfx+"por.tl.makedef","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:default-link'')]"); + private final String TBL_PORTALPAGE_ADMIN = getProp(casePfx+"tbl.portalpage.admin","//table[contains(@id,'obj-nav-form:pages-datatable')]"); + private final String PAG_TL_MAIN = getProp(casePfx+"pag.tl.main","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:object-link'')]"); + private final String PAG_TL_LAYOUT = getProp(casePfx+"pag.tl.layout","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:edit-page-layout'')]"); + private final String PAG_TL_SECURITY = getProp(casePfx+"pag.tl.security","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:security-link'')]"); + private final String PAG_TL_PROPERTIES = getProp(casePfx+"pag.tl.properties","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:prop-link'')]"); + private final String PAG_TL_THEME = getProp(casePfx+"pag.tl.theme","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:theme-link'')]"); + private final String PAG_TL_RENAME = getProp(casePfx+"pag.tl.rename","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-link'')]"); + private final String PAG_TL_DISPLAY = getProp(casePfx+"pag.tl.display","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-display'')]"); + private final String PAG_TL_DELETE = getProp(casePfx+"pag.tl.delete","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:delete-link'')]"); + private final String PAG_TL_MAKEDEF = getProp(casePfx+"pag.tl.makedef","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:default-link'')]"); + + + /// 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')]"; + + public static String WSRP_CONSUMER_TABLE = "//table[contains(@id,':consumer-list-form:consumersList')]"; + @BeforeMethod(groups = { "log" }) + public void loginBeforeTest() { + logoutIfPossible(); + login("admin", "admin"); + } + + @AfterMethod(groups = { "log" }) + public void logoutAfterTest() { + //logout(); + } + + private String PORTLET = ""; + + @Test(enabled = true, description = "Creating a standard BEA portlet.") + public void testEnd2EndBeaPortlet(){ + + String consName = "BeaE2E"; + String portalName = "default"; + String pageName = "default"; + String defName= "BEA: Hello World"; + String insName = "BeaPor"; + + createConsumer(consName); + createInstance(defName, consName, insName); + addPortlet(portalName, pageName, PORTLET, "portlet"); + + } + + private void createConsumer(String consumerName){ + selenium.open("/portal/"); + selenium.waitForPageToLoad(PAGE_LOAD); + selenium.click("link=Admin"); + selenium.waitForPageToLoad(PAGE_LOAD); + selenium.click("link=WSRP"); + selenium.waitForPageToLoad(PAGE_LOAD); + clickIfVisible(ID_LINK_CONSCONF); + + selenium.type(INPUT_CREATECONS, consumerName); + + selenium.click(SUBMIT_CREATECONS); + selenium.waitForPageToLoad(PAGE_LOAD); + selenium.type(INPUT_CACHEEXP, "600"); + + 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("Missing value")); + + selenium.type(INPUT_CONS_REGVALUE, "public"); + selenium.click(SUBMIT_CONS_REGVAL); + selenium.waitForPageToLoad(PAGE_LOAD); + Assert.assertTrue(selenium.isTextPresent("Refresh was successful.")); + selenium.click(SUBMIT_REFRESHFINAL); + selenium.waitForPageToLoad(PAGE_LOAD); + Assert.assertTrue(selenium.isTextPresent(consumerName)); + } + + private void createInstance(String defName, String type, String insName){ + selenium.open("/portal/"); + selenium.waitForPageToLoad(PAGE_LOAD); + + clickIfVisible(LINK_ADMIN); + clickIfVisible(LINK_ADMIN); + clickIfVisible(LINK_TAB_PD); + clickIfVisible(LINK_PD_MAIN); + + selenium.select(SEL_CONS_TYPE, "label="+type); + selenium.click(SUB_VIEW_PORTLETS); + selenium.waitForPageToLoad(PAGE_LOAD); + + int r = findTableRow(TABLE_PORTLET, defName, 0); + + selenium.click(MessageFormat.format(T_LINK_CREATE,r-1)); + selenium.waitForPageToLoad(PAGE_LOAD); + + selenium.type(INPUT_INSTANCE_NAME, insName); + selenium.click(SUBMIT_CREATE_INST); + selenium.waitForPageToLoad(PAGE_LOAD); + Assert.assertTrue(selenium.isTextPresent(insName + " portlet details")); + } + + private void addPortlet(String portalName, String pageName, String portletName, String type) { + selenium.open("/portal/"); + selenium.waitForPageToLoad(PAGE_LOAD); + + selenium.click("link=Admin"); + selenium.waitForPageToLoad(PAGE_LOAD); + + clickIfVisible(TAB_PORTALOBJ_ID); + clickIfVisible(LNK_PORTALS_ID); + clickIfVisible(LNK_PORTAL_HOME); + + int r = findTableRow(TBL_PORTAL_ADMIN, portalName, 0) - 1; + selenium.click(MessageFormat.format(POR_TL_MAIN, r)); + selenium.waitForPageToLoad(PAGE_LOAD); + + r = findTableRow(TBL_PORTALPAGE_ADMIN, pageName, 0) - 1; + + // click on the page layout + selenium.click(MessageFormat.format(PAG_TL_LAYOUT, r)); + + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + //hack + selenium.select(SEL_PORTLET_TYPE, "label=" + "cms"); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + selenium.select(SEL_PORTLET_TYPE, "label=" + type); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + selenium.click(portletName); + selenium.waitForPageToLoad(PAGE_LOAD); + + selenium.click(SUB_LAYOUT_ADD_CENTER); + selenium.waitForPageToLoad(PAGE_LOAD); + } +} 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-02-19 09:58:37 UTC (rev 12836) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-02-19 11:43:13 UTC (rev 12837) @@ -11,6 +11,9 @@ */ @Test(groups = { "cms_wsrp" }, enabled = true, description = "WSRP test case.") public class WSRPTestCase extends JBossPortalSeleniumTestCase { + + public static String casePfx = "test.wsrp."; + private static final String INP_CONSUMER_NAME = "//input[contains(@id,'edit-cons-form:id')]"; private static final String SUBMIT_REFRESH_CANCEL = "//a[contains(@id,'edit-cons-form:list-cons-link')]"; private static final String SUBMIT_PROD_SAVE = "//input[contains(@id,'producer-form:save-producer')]"; @@ -43,6 +46,7 @@ private static final String LINK_T_CONS_DEL="//a[contains(@id,''consumer-list-form:consumersList:{0}:delete'')]"; 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-02-19 09:58:37 UTC (rev 12836) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-02-19 11:43:13 UTC (rev 12837) @@ -1 +1,63 @@ -vilko.pilko=mimilko \ No newline at end of file +# EndToEndBeaPortlet + +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')] +e2e.wsrp.submit.consdel.conf=//a[contains(@id,'confirm-delete-form:destroy-link')] +e2e.wsrp.submit.cons.regval=//input[contains(@id,'edit-cons-form:refresh-cons-link')] +e2e.wsrp.submit.refreshfinal=//input[contains(@id,'edit-cons-form:refresh-cons-link')] +e2e.wsrp.input.cons.regvalue=//input[contains(@id,'edit-cons-form:existingProps:0:prop-value-input')] +e2e.wsrp.submit.refreshsave=//input[contains(@id,'edit-cons-form:refresh-cons-link')] +e2e.wsrp.input.conswsdl=//input[contains(@id,'edit-cons-form:wsdl')] +e2e.wsrp.input.cacheexp=//input[contains(@id,'edit-cons-form:cache')] +e2e.wsrp.submit.addprop.init=//a[contains(@id,'producer-form:add-reg-prop')] +e2e.wsrp.submit.addprop=//a[contains(@id,'producer-form:add-reg-prop')] +e2e.wsrp.input.prophint=//input[contains(@id,'producer-form:reg-properties:0:hint')] +e2e.wsrp.input.proplabel=//input[contains(@id,'producer-form:reg-properties:0:label')] +e2e.wsrp.input.propname=//input[contains(@id,'producer-form:reg-properties:0:name')] +e2e.wsrp.submit.createcons=//input[contains(@id,'createConsumer:createConsumerButton')] +e2e.wsrp.input.createcons=//input[contains(@id,'createConsumer:consumerName')] +e2e.wsrp.id.link.prodconf=//a[contains(@id,'cons-temp-form:producer-link')] +e2e.wsrp.id.link.consconf=//a[contains(@id,'producer-temp-form:consumersTab')] +e2e.wsrp.link.consumer.home=//a[contains(@id,'cons-temp-form1:list-cons-link')] +e2e.wsrp.link.t.cons.con=//a[contains(@id,''consumer-list-form:consumersList:{0}:configure'')] +e2e.wsrp.link.t.cons.ref=//a[contains(@id,''consumer-list-form:consumersList:{0}:refresh'')] +e2e.wsrp.link.t.cons.act=//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')] +e2e.wsrp.link.t.cons.dea=//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')] +e2e.wsrp.link.t.cons.reg=//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')] +e2e.wsrp.link.t.cons.der=//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')] +e2e.wsrp.link.t.cons.del=//a[contains(@id,''consumer-list-form:consumersList:{0}:delete'')] + +# EndtoEndPortalAdminTestCase + +e2e.portal.sel.portlet.type=_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:windowForm:instanceId +e2e.portal.sub.layout.add.center=//input[contains(@id,'layoutForm:a_center')] +e2e.portal.inp.window.name=//input[contains(@id,'windowForm:windowName')] +e2e.portal.sub.rename.portal=//input[contains(@id,'renameForm:rename')] +e2e.portal.inp.rename.portal=//input[contains(@id,'renameForm:newName')] +e2e.portal.sub.delete.portal.conf=//input[contains(@id,'delete-view:confirm-form:delete')] +e2e.portal.inp.submit.pagecreate=//input[contains(@id,'create-page-form:create-page')] +e2e.portal.inp.pagename=//input[contains(@id,'create-page-form:pageName')] +e2e.portal.inp.portalname=//input[contains(@id,'create-portal-form:name')] +e2e.portal.inp.submit.createportal=//input[contains(@id,'create-portal-form:create-portal')] +e2e.portal.tab.portalobj.id=Link=Admin +e2e.portal.lnk.portals.id=link=*Portal Objects* +e2e.portal.lnk.portal.home=//a[contains(@id,'obj-temp-form:object-link-0')] +e2e.portal.tbl.portal.admin=//table[contains(@id,'obj-nav-form:portal-datatable')] +e2e.portal.por.tl.main=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:object-iid-link'')] +e2e.portal.por.tl.security=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:security-link'')] +e2e.portal.por.tl.properties=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:prop-link'')] +e2e.portal.por.tl.theme=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:theme-link'')] +e2e.portal.por.tl.rename=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:rename'')] +e2e.portal.por.tl.delete=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:delete'')] +e2e.portal.por.tl.makedef=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:default-link'')] +e2e.portal.tbl.portalpage.admin=//table[contains(@id,'obj-nav-form:pages-datatable')] +e2e.portal.pag.tl.main=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:object-link'')] +e2e.portal.pag.tl.layout=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:edit-page-layout'')] +e2e.portal.pag.tl.security=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:security-link'')] +e2e.portal.pag.tl.properties=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:prop-link'')] +e2e.portal.pag.tl.theme=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:theme-link'')] +e2e.portal.pag.tl.rename=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-link'')] +e2e.portal.pag.tl.display=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-display'')] +e2e.portal.pag.tl.delete=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:delete-link'')] +e2e.portal.pag.tl.makedef=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:default-link'')] Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-02-19 09:58:37 UTC (rev 12836) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-02-19 11:43:13 UTC (rev 12837) @@ -14,40 +14,43 @@ /** * @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a> */ -@Test(groups = {"usecase"}, enabled = true, description = "Creating of new portal with content.") +@Test(groups = {"end2end"}, enabled = true, description = "Creating of new portal with content.") public class EndtoEndPortalAdminTestCase extends JBossPortalSeleniumTestCase { - public static final String SEL_PORTLET_TYPE = "_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:windowForm:instanceId"; - private static final String SUB_LAYOUT_ADD_CENTER = "//input[contains(@id,'layoutForm:a_center')]"; - private static final String INP_WINDOW_NAME = "//input[contains(@id,'windowForm:windowName')]"; - private static final String SUB_RENAME_PORTAL = "//input[contains(@id,'renameForm:rename')]"; - private static final String INP_RENAME_PORTAL = "//input[contains(@id,'renameForm:newName')]"; - private static final String SUB_DELETE_PORTAL_CONF = "//input[contains(@id,'delete-view:confirm-form:delete')]"; - private static final String INP_SUBMIT_PAGECREATE = "//input[contains(@id,'create-page-form:create-page')]"; - private static final String INP_PAGENAME = "//input[contains(@id,'create-page-form:pageName')]"; - private static final String INP_PORTALNAME = "//input[contains(@id,'create-portal-form:name')]"; - private static final String INP_SUBMIT_CREATEPORTAL = "//input[contains(@id,'create-portal-form:create-portal')]"; - private final String TAB_PORTALOBJ_ID = "Link=Admin"; - private final String LNK_PORTALS_ID = "link=*Portal Objects*"; - private final String LNK_PORTAL_HOME = "//a[contains(@id,'obj-temp-form:object-link-0')]"; - private final String TBL_PORTAL_ADMIN = "//table[contains(@id,'obj-nav-form:portal-datatable')]"; - private final String POR_TL_MAIN = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:object-iid-link'')]"; - private final String POR_TL_SECURITY = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:security-link'')]"; - private final String POR_TL_PROPERTIES = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:prop-link'')]"; - private final String POR_TL_THEME = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:theme-link'')]"; - private final String POR_TL_RENAME = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:rename'')]"; - private final String POR_TL_DELETE = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:delete'')]"; - private final String POR_TL_MAKEDEF = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:default-link'')]"; - private final String TBL_PORTALPAGE_ADMIN = "//table[contains(@id,'obj-nav-form:pages-datatable')]"; - private final String PAG_TL_MAIN = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:object-link'')]"; - private final String PAG_TL_LAYOUT = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:edit-page-layout'')]"; - private final String PAG_TL_SECURITY = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:security-link'')]"; - private final String PAG_TL_PROPERTIES = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:prop-link'')]"; - private final String PAG_TL_THEME = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:theme-link'')]"; - private final String PAG_TL_RENAME = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-link'')]"; - private final String PAG_TL_DISPLAY = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-display'')]"; - private final String PAG_TL_DELETE = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:delete-link'')]"; - private final String PAG_TL_MAKEDEF = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:default-link'')]"; + public static String casePfx = "portal.e2e."; + + public final String SEL_PORTLET_TYPE = getProp(casePfx+"sel.portlet.type","_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:windowForm:instanceId"); + private final String SUB_LAYOUT_ADD_CENTER = getProp(casePfx+"sub.layout.add.center","//input[contains(@id,'layoutForm:a_center')]"); + private final String INP_WINDOW_NAME = getProp(casePfx+"inp.window.name","//input[contains(@id,'windowForm:windowName')]"); + private final String SUB_RENAME_PORTAL = getProp(casePfx+"sub.rename.portal","//input[contains(@id,'renameForm:rename')]"); + private final String INP_RENAME_PORTAL = getProp(casePfx+"inp.rename.portal","//input[contains(@id,'renameForm:newName')]"); + private final String SUB_DELETE_PORTAL_CONF = getProp(casePfx+"sub.delete.portal.conf","//input[contains(@id,'delete-view:confirm-form:delete')]"); + private final String INP_SUBMIT_PAGECREATE = getProp(casePfx+"inp.submit.pagecreate","//input[contains(@id,'create-page-form:create-page')]"); + private final String INP_PAGENAME = getProp(casePfx+"inp.pagename","//input[contains(@id,'create-page-form:pageName')]"); + private final String INP_PORTALNAME = getProp(casePfx+"inp.portalname","//input[contains(@id,'create-portal-form:name')]"); + private final String INP_SUBMIT_CREATEPORTAL = getProp(casePfx+"inp.submit.createportal","//input[contains(@id,'create-portal-form:create-portal')]"); + private final String TAB_PORTALOBJ_ID = getProp(casePfx+"tab.portalobj.id","Link=Admin"); + private final String LNK_PORTALS_ID = getProp(casePfx+"lnk.portals.id","link=*Portal Objects*"); + private final String LNK_PORTAL_HOME = getProp(casePfx+"lnk.portal.home","//a[contains(@id,'obj-temp-form:object-link-0')]"); + private final String TBL_PORTAL_ADMIN = getProp(casePfx+"tbl.portal.admin","//table[contains(@id,'obj-nav-form:portal-datatable')]"); + private final String POR_TL_MAIN = getProp(casePfx+"por.tl.main","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:object-iid-link'')]"); + private final String POR_TL_SECURITY = getProp(casePfx+"por.tl.security","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:security-link'')]"); + private final String POR_TL_PROPERTIES = getProp(casePfx+"por.tl.properties","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:prop-link'')]"); + private final String POR_TL_THEME = getProp(casePfx+"por.tl.theme","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:theme-link'')]"); + private final String POR_TL_RENAME = getProp(casePfx+"por.tl.rename","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:rename'')]"); + private final String POR_TL_DELETE = getProp(casePfx+"por.tl.delete","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:delete'')]"); + private final String POR_TL_MAKEDEF = getProp(casePfx+"por.tl.makedef","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:default-link'')]"); + private final String TBL_PORTALPAGE_ADMIN = getProp(casePfx+"tbl.portalpage.admin","//table[contains(@id,'obj-nav-form:pages-datatable')]"); + private final String PAG_TL_MAIN = getProp(casePfx+"pag.tl.main","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:object-link'')]"); + private final String PAG_TL_LAYOUT = getProp(casePfx+"pag.tl.layout","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:edit-page-layout'')]"); + private final String PAG_TL_SECURITY = getProp(casePfx+"pag.tl.security","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:security-link'')]"); + private final String PAG_TL_PROPERTIES = getProp(casePfx+"pag.tl.properties","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:prop-link'')]"); + private final String PAG_TL_THEME = getProp(casePfx+"pag.tl.theme","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:theme-link'')]"); + private final String PAG_TL_RENAME = getProp(casePfx+"pag.tl.rename","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-link'')]"); + private final String PAG_TL_DISPLAY = getProp(casePfx+"pag.tl.display","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-display'')]"); + private final String PAG_TL_DELETE = getProp(casePfx+"pag.tl.delete","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:delete-link'')]"); + private final String PAG_TL_MAKEDEF = getProp(casePfx+"pag.tl.makedef","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:default-link'')]"); + /* - create a new portal - add couple of page to the portal @@ -65,6 +68,7 @@ @AfterMethod(groups = {"log"}) public void logoutAfterTest() { } + final String portalName = "UseCasePortal"; final String page1Name = "firstPage"; final String page2Name = "anotherPage"; @@ -80,7 +84,6 @@ createPortal(portalName); addPage(page1Name); - //selenium.setSpeed("4000"); addPage(page2Name); addPage(page3Name); addPage(page4Name); @@ -165,26 +168,21 @@ try { Thread.sleep(5000); } catch (InterruptedException e) { - // TODO Auto-generated catch block e.printStackTrace(); } - //hack selenium.select(SEL_PORTLET_TYPE, "label=" + "cms"); try { Thread.sleep(5000); } catch (InterruptedException e) { - // TODO Auto-generated catch block e.printStackTrace(); } - selenium.select(SEL_PORTLET_TYPE, "label=" + type); try { Thread.sleep(5000); } catch (InterruptedException e) { - // TODO Auto-generated catch block e.printStackTrace(); } Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-02-19 09:58:37 UTC (rev 12836) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-02-19 11:43:13 UTC (rev 12837) @@ -52,12 +52,6 @@ <class name="org.jboss.portal.test.selenium.portal.PortletInstancesTestCase"></class></classes> </test> - <test verbose="2" name="org.jboss.portal.test.selenium.usecase.NewPortalUsecaseTestCase" annotations="JDK"> - <classes> - <class name="org.jboss.portal.test.selenium.usecase.NewPortalUsecaseTestCase"/> - </classes> - </test> - <test name="org.jboss.portal.test.selenium.cms.CMSFileTestCase" verbose="2" annotations="JDK"> <classes> Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/usecaseng.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/usecaseng.xml 2009-02-19 09:58:37 UTC (rev 12836) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/usecaseng.xml 2009-02-19 11:43:13 UTC (rev 12837) @@ -1,9 +1,9 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <suite name="SeleniumTest"> - <test verbose="2" name="org.jboss.portal.test.selenium.usecase.NewPortalUsecaseTestCase" annotations="JDK"> + <test verbose="2" name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase" annotations="JDK"> <classes> - <class name="org.jboss.portal.test.selenium.usecase.NewPortalUsecaseTestCase"/> + <class name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase"/> </classes> </test>