Author: vrockai
Date: 2009-02-25 08:23:24 -0500 (Wed, 25 Feb 2009)
New Revision: 12892
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/portal/EndtoEndPortalAdminTestCase.java
Log:
[JBPORTAL-2317] - end2end bea portlet
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-02-25
11:16:58 UTC (rev 12891)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-02-25
13:23:24 UTC (rev 12892)
@@ -13,9 +13,9 @@
@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 SUB_VIEW_PORTLETS =
"//input[contains(@id,'definition-form:view-portlets')]";
- private static final String SEL_CONS_TYPE =
"_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:definition-form:menu";
+ private static final String SEL_CONS_TYPE =
"//select[contains(@id,'definition-form:menu')]";
public static String casePfx = "e2e.wsrp.";
@@ -52,7 +52,7 @@
///
- public final String SEL_PORTLET_TYPE =
getProp(casePfx+"sel.portlet.type","_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:windowForm:instanceId");
+ public final String SEL_PORTLET_TYPE =
getProp(casePfx+"sel.portlet.type","//select[contains(@id,'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')]");
@@ -121,12 +121,18 @@
String portalName = "default";
String pageName = "default";
String defName= "BEA: Hello World";
- String insName = "BeaPor";
+ String insName = "1BeaPor";
createConsumer(consName);
createInstance(defName, consName, insName);
- addPortlet(portalName, pageName, PORTLET, "portlet");
-
+ addPortlet(portalName, pageName, insName, "portlet");
+
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isTextPresent("1BeaPorWindow"));
+ Assert.assertTrue(selenium.isTextPresent("Welcome to WebLogic Portal WSRP
Demo."));
+
}
private void createConsumer(String consumerName){
@@ -223,11 +229,12 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
-
- selenium.click(portletName);
+
+ selenium.click("link=*"+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/portal/EndtoEndPortalAdminTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-02-25
11:16:58 UTC (rev 12891)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-02-25
13:23:24 UTC (rev 12892)
@@ -253,11 +253,12 @@
selenium.waitForPageToLoad(PAGE_LOAD);
portletName = links[1];
}
-
+
selenium.click("link=*" + portletName+"*");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(SUB_LAYOUT_ADD_CENTER);
selenium.waitForPageToLoad(PAGE_LOAD);
+
}
Show replies by date