[portal-commits] JBoss Portal SVN: r11993 - branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Fri Sep 26 09:28:52 EDT 2008
Author: vrockai
Date: 2008-09-26 09:28:52 -0400 (Fri, 26 Sep 2008)
New Revision: 11993
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
Log:
wsrp and dashboard fixes
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-26 13:04:02 UTC (rev 11992)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-26 13:28:52 UTC (rev 11993)
@@ -4,6 +4,7 @@
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+
/**
* @author <a href="mailto:vrockai at redhat.com">Viliam Rockai</a>
*/
@@ -15,7 +16,7 @@
private static final String LINK_CONFIGURE_DASHBOARD = "link=Configure dashboard";
private static final String LINK_DASHBOARD = "link=Dashboard";
private static final String SELECT_PAGE = "page-selector-form:pageNameSelector";
- private static final String INPUT_PAGENAME = "dashboard-form:pageName";
+ private static final String INPUT_PAGENAME = "dashboard-form:pageName";
private static final String SUBMIT_CREATEPAGE = "dashboard-form:save-button";
private static final String SELECT_LAYOUT = "dashboardLayoutForm:layoutSelector";
private static final String SUBMIT_LAYOUTSEL = "dashboardLayoutForm:update-layout";
@@ -55,9 +56,9 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
-
- selectIfNotSelected("DashTestPage");
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
+
selenium.select(SELECT_THEME, "label=renaissance");
selenium.click(SUBMIT_THEMESEL);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -71,26 +72,20 @@
selenium.waitForPageToLoad(PAGE_LOAD);
}
-
- Assert.assertEquals(selenium.getSelectedLabel(SELECT_THEME), "renaissance","Previously selected theme other then expected.");
+ Assert.assertEquals(selenium.getSelectedLabel(SELECT_THEME), "renaissance", "Previously selected theme other then expected.");
}
- private void selectIfNotSelected(String label) {
- if (!selenium.getSelectedLabel(SELECT_PAGE).equals(label))
- selenium.select(SELECT_PAGE, "label="+label);
- selenium.waitForPageToLoad(PAGE_LOAD);
- }
+
@Test(enabled = true, dependsOnMethods = { "testCreatePage" })
public void testUpdateLayout() {
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
-
- Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT),"DashTestPage","Default layout is not called \"default\".");
- selectIfNotSelected("DashTestPage");
-
+
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
+
selenium.select(SELECT_LAYOUT, "label=generic");
selenium.click(SUBMIT_LAYOUTSEL);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -104,7 +99,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
}
- Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT),"generic","Previously selected layout other then expected.");
+ Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT), "generic", "Previously selected layout other then expected.");
}
@Test(enabled = true, dependsOnMethods = { "testCreatePage" })
@@ -114,7 +109,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
- selectIfNotSelected("DashTestPage");
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
selenium.click("link=Who's online portlet");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(SUBMIT_ADDCENTER);
@@ -123,12 +118,12 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=DashTestPage");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Current users"));
Assert.assertTrue(selenium.isTextPresent("Whose 1 is logged-in:"));
Assert.assertTrue(selenium.isTextPresent("[admin]"));
}
-
+
@Test(enabled = true, dependsOnMethods = { "testAddPortlet" })
public void testDeletePortlet() {
@@ -136,9 +131,9 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
-
- selectIfNotSelected("DashTestPage");
-
+
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
+
selenium.addSelection("layoutForm:selectMany_center", "label=CurrentUsersPortletWindow");
selenium.click("layoutForm:l_center");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -147,12 +142,11 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=DashTestPage");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertFalse(selenium.isTextPresent("Current users"));
Assert.assertFalse(selenium.isTextPresent("Whose 1 is logged-in:"));
Assert.assertFalse(selenium.isTextPresent("[admin]"));
}
-
@Test(enabled = false, dependsOnMethods = { "testCreatePage" })
public void testAddGooglePortlet() {
@@ -160,7 +154,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
- selectIfNotSelected("DashTestPage");
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
selenium.select("abc:instanceId", "label=widget/google");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Hindu God of the Week");
@@ -171,16 +165,17 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=DashTestPage");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Hindu God of the Week"));
}
// http://www.jboss.com/index.html?module=bb&op=viewtopic&t=143023
- @Test(enabled = false)
- public void testBugResetPortletSetting()
- {
+ @Test(enabled = true)
+ public void testBugResetPortletSetting() {
final String pageName = "page1";
+ final String pageNameNew = "page1a";
+ // create page
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
@@ -192,35 +187,69 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
-
- Assert.assertTrue(selenium.isElementPresent("link="+pageName));
- selenium.click("link="+pageName);
+
+ Assert.assertTrue(selenium.isElementPresent("link=" + pageName));
+ selenium.click("link=" + pageName);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Powered by JBoss Portal"));
-
+
+ // add weather portlet
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
- selectIfNotSelected(pageName);
- selenium.click("Link=Weather Portlet");
+
+ selectIfNotSelected(SELECT_PAGE,pageName);
+
+ selenium.click("Link=*Weather Portlet*");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(SUBMIT_ADDLEFT);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click("link="+pageName);
+ selenium.click("link=" + pageName);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Miami, FL, US"));
-
-
+
+ // change the properties
+ selenium.click("//div[@id='dashboard:YWRtaW4=.cGFnZTE=.V2VhdGhlclBvcnRsZXRXaW5kb3c=']/div/table/tbody/tr[1]/td[2]/div/div/div[2]/span[1]/a");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.type("newzip", "41001");
+ selenium.click("submit");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("Alexandria"));
+
+ // rename portal
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_CONFIGURE_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selectIfNotSelected(SELECT_PAGE,pageName);
+
+ selenium.type("renameForm:newName", pageNameNew);
+ selenium.click("renameForm:rename-button");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ // check the portlet again
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=" + pageNameNew);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isTextPresent("Alexandria"), "Previously selected portlet settings were changes after renaming of portal page.");
+
}
-
- //TODO write an extension for checking of ordering of elements
+
+ // TODO write an extension for checking of ordering of elements
@Test(enabled = false, dependsOnMethods = { "testCreatePage" })
public void testReorder() {
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-26 13:04:02 UTC (rev 11992)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-26 13:28:52 UTC (rev 11993)
@@ -66,6 +66,18 @@
protected int countTableRows(String tableLocation){
return Integer.valueOf(selenium.getEval("selenium.countTableRows(\"" + tableLocation + "\")"));
}
+
+ protected void clickAndWait(String locator){
+ selenium.click(locator);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ }
+
+ protected void selectIfNotSelected(String selector, String label) {
+ if (!selenium.getSelectedLabel(selector).equals(label)) {
+ selenium.select(selector, "label=" + label);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ }
+ }
protected void login(String username, String password) {
selenium.setTimeout("0");
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-26 13:04:02 UTC (rev 11992)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-26 13:28:52 UTC (rev 11993)
@@ -33,6 +33,7 @@
private static final String ID_LINK_PRODCONF = "cons-temp-form:producer-link";
private static final String ID_LINK_CONSCONF = "producer-temp-form:consumersTab";
private static final String LINK_CONSUMER_HOME ="cons-temp-form1:list-cons-link";
+
private static final String LINK_T_CONS_CON="consumer-list-form:consumersList:{0}:configure";
private static final String LINK_T_CONS_REF="consumer-list-form:consumersList:{0}:refresh";
private static final String LINK_T_CONS_ACT="consumer-list-form:consumersList:{0}:activate";
@@ -246,8 +247,7 @@
public void testConfigureConsumer() {
final String name = "renameMe";
final String nameNew = "renameNewMe";
-
- createConsumer("BEAdel", "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
+
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
@@ -263,6 +263,7 @@
Assert.assertTrue(r<0, "Not created consumer already in table");
+ // create consumer to be renamed
createConsumer(name, "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
clickIfVisible(ID_LINK_CONSCONF);
@@ -271,11 +272,14 @@
r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
Assert.assertTrue(r>0, "Created consumer not found in table");
- selenium.click(MessageFormat.format(LINK_T_CONS_CON,r));
+ // rename the consumer
+ selenium.click(MessageFormat.format(LINK_T_CONS_CON,r-1));
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type("edit-cons-form:id", nameNew);
selenium.click("edit-cons-form:refresh-cons-link");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(LINK_CONSUMER_HOME);
More information about the portal-commits
mailing list