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

portal-commits at lists.jboss.org portal-commits at lists.jboss.org
Fri Sep 26 11:12:22 EDT 2008


Author: vrockai
Date: 2008-09-26 11:12:22 -0400 (Fri, 26 Sep 2008)
New Revision: 11998

Modified:
   branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
   branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
   branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
   branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java
   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/portal/AdminPortalTestCase.java
Log:
several tastcase propagations from 2.6.7

Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java	2008-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java	2008-09-26 15:12:22 UTC (rev 11998)
@@ -1,21 +1,22 @@
 package org.jboss.portal.test.selenium;
 
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import org.testng.Assert;
 
-import com.sun.java_cup.internal.internal_error;
 /**
  * @author <a href="mailto:vrockai at redhat.com">Viliam Rockai</a>
  */
 @Test(groups = { "cms_dashboard" }, enabled = true, description = "Dashboard issues test case.")
 public class DashboardTestCase extends JBossPortalSeleniumTestCase {
 
+	private static final String SUBMIT_ADDCENTER = "layoutForm:a_center";
+	private static final String SUBMIT_ADDLEFT = "layoutForm:a_left";
 	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,25 +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);
-		selectIfNotSelected("DashTestPage");
-		Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT),"default","Default layout is not called \"default\".");
 
+		selectIfNotSelected(SELECT_PAGE,"DashTestPage");
+
 		selenium.select(SELECT_LAYOUT, "label=generic");
 		selenium.click(SUBMIT_LAYOUTSEL);
 		selenium.waitForPageToLoad(PAGE_LOAD);
@@ -103,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" })
@@ -113,41 +109,147 @@
 		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("layoutForm:a_center");
+		selenium.click(SUBMIT_ADDCENTER);
 		selenium.waitForPageToLoad(PAGE_LOAD);
 		selenium.click(LINK_DASHBOARD);
 		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() {
+
+		selenium.click(LINK_DASHBOARD);
+		selenium.waitForPageToLoad(PAGE_LOAD);
+		selenium.click(LINK_CONFIGURE_DASHBOARD);
+		selenium.waitForPageToLoad(PAGE_LOAD);
+
+		selectIfNotSelected(SELECT_PAGE,"DashTestPage");
+
+		selenium.addSelection("layoutForm:selectMany_center", "label=CurrentUsersPortletWindow");
+		selenium.click("layoutForm:l_center");
+		selenium.waitForPageToLoad(PAGE_LOAD);
+
+		selenium.click(LINK_DASHBOARD);
+		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() {
 		selenium.click(LINK_DASHBOARD);
 		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");
 		selenium.waitForPageToLoad(PAGE_LOAD);
-		selenium.click("layoutForm:a_center");
+		selenium.click(SUBMIT_ADDCENTER);
 		selenium.waitForPageToLoad(PAGE_LOAD);
 		selenium.click(LINK_DASHBOARD);
 		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 = 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);
+		selenium.waitForPageToLoad(PAGE_LOAD);
+		selenium.click(LINK_CONFIGURE_DASHBOARD);
+		selenium.waitForPageToLoad(PAGE_LOAD);
+		selenium.type(INPUT_PAGENAME, pageName);
+		selenium.click(SUBMIT_CREATEPAGE);
+		selenium.waitForPageToLoad(PAGE_LOAD);
+		selenium.click(LINK_DASHBOARD);
+		selenium.waitForPageToLoad(PAGE_LOAD);
+
+		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(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.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
 	@Test(enabled = false, dependsOnMethods = { "testCreatePage" })
 	public void testReorder() {
 

Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java	2008-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java	2008-09-26 15:12:22 UTC (rev 11998)
@@ -132,7 +132,7 @@
 		selenium.waitForPageToLoad(PAGE_LOAD);
 		Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page.");
 
-		final String CHECK_ROLE = MessageFormat.format(this.ID_CHECK_ROLE, role);
+		final String CHECK_ROLE = MessageFormat.format(ID_CHECK_ROLE, role);
 		selenium.click(CHECK_ROLE);
 
 		selenium.click(ID_SUBMIT_ASSIGN_ROLE);
@@ -155,7 +155,7 @@
 		Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page.");
 
 		// check the tempRole check box
-		final String CHECK_ROLE = MessageFormat.format(this.ID_CHECK_ROLE, role);
+		final String CHECK_ROLE = MessageFormat.format(ID_CHECK_ROLE, role);
 		selenium.click(CHECK_ROLE);
 
 		selenium.click(ID_SUBMIT_ASSIGN_ROLE);

Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java	2008-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java	2008-09-26 15:12:22 UTC (rev 11998)
@@ -38,11 +38,21 @@
 		
 		if (selenium.isElementPresent(id)){
 			selenium.click(id);
-			
+
 			selenium.waitForPageToLoad(PAGE_LOAD);
 		}
 	}
+	
+	protected void clickIfVisible(String id, String awaited) {
+		
+		if (selenium.isElementPresent(id)){
+			selenium.click(id);
+			selenium.waitForPageToLoad(PAGE_LOAD);
+		}
+		Assert.assertTrue(selenium.isTextPresent(awaited));
+	}
 
+	@Deprecated
 	protected boolean findLink(String id) {
 		for (String link : selenium.getAllLinks()) {
 			if (link.equals(id)) {
@@ -65,6 +75,23 @@
 	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 openAndWait(String locator){
+		selenium.open(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_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java	2008-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java	2008-09-26 15:12:22 UTC (rev 11998)
@@ -1,15 +1,13 @@
 package org.jboss.portal.test.selenium;
 
-import java.util.Date;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Vector;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
-
-import com.sun.org.apache.xerces.internal.impl.dtd.models.DFAContentModel;
 /**
  * @author <a href="mailto:vrockai at redhat.com">Viliam Rockai</a>
  */

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	2008-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java	2008-09-26 15:12:22 UTC (rev 11998)
@@ -2,12 +2,10 @@
 
 import java.text.MessageFormat;
 
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import org.testng.Assert;
-
-import com.sun.java_cup.internal.internal_error;
 /**
  * @author <a href="mailto:vrockai at redhat.com">Viliam Rockai</a>
  */
@@ -17,16 +15,7 @@
 	private static final String SUBMIT_REFRESH_CANCEL = "edit-cons-form:list-cons-link_1";
 	private static final String SUBMIT_PROD_SAVE = "producer-form:save-producer";
 	private static final String SUBMIT_CONSDEL_CONF = "confirm-delete-form:destroy-link";
-	// private static final String ID_LINK_PRODCONF =
-	// "_id1jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id3jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"
-	// ;
-	// private static final String ID_LINK_CONSCONF =
-	// "_id1jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id3jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"
-	// ;
-
 	
-
-	// TODO shouldn't be same as REFRESH?
 	private static final String SUBMIT_CONS_REGVAL = "edit-cons-form:refresh-cons-link";
 	private static final String SUBMIT_REFRESHFINAL = "edit-cons-form:refresh-cons-link";
 	
@@ -44,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";
@@ -51,9 +41,8 @@
 	private static final String LINK_T_CONS_REG="consumer-list-form:consumersList:{0}:register";
 	private static final String LINK_T_CONS_DER="consumer-list-form:consumersList:{0}:register";
 	private static final String LINK_T_CONS_DEL="consumer-list-form:consumersList:{0}:delete";
-		
-	
-//	public static String WSRP_CONSUMER_TABLE = "//form[@id='_id18jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj']/table";
+
+
 	public static String WSRP_CONSUMER_TABLE = "consumer-list-form:consumersList";
 	@BeforeMethod(groups = { "log" })
 	public void loginBeforeTest() {
@@ -198,7 +187,6 @@
 	public void testBeaConsumerDelete() {
 
 		createConsumer("BEAdel", "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
-		//selenium.setSpeed("2000");
 		selenium.open("/portal/");
 		selenium.waitForPageToLoad(PAGE_LOAD);
 		selenium.click("link=Admin");
@@ -254,7 +242,54 @@
 		Assert.assertEquals("tetsPropHint", selenium.getValue(INPUT_PROPHINT));
 
 	}
+	
+	@Test(enabled = true, description = "Renaming a consumer through the configure button.")
+	public void testConfigureConsumer() {
+		final String name = "renameMe";
+		final String nameNew = "renameNewMe";
 
+		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);
+		clickIfVisible(LINK_CONSUMER_HOME);
+
+		
+		int r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
+		
+		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);
+		clickIfVisible(LINK_CONSUMER_HOME);
+		
+		r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
+		Assert.assertTrue(r>0, "Created consumer not found in table");
+		
+		// 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);
+		
+		r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
+		Assert.assertTrue(r<0, "Renamed consumer still in table");
+		
+		r = findTableRow(WSRP_CONSUMER_TABLE, nameNew, 0);
+		Assert.assertTrue(r>0, "Renamed consumer not found in table");
+	}
+	
 	private void createConsumer(String name, String timeout, String address) {
 		selenium.open("/portal/");
 		selenium.waitForPageToLoad(PAGE_LOAD);
@@ -267,7 +302,6 @@
 		selenium.click(SUBMIT_CREATECONS);
 		selenium.waitForPageToLoad(PAGE_LOAD);
 		selenium.type(INPUT_CACHEEXP, timeout);
-		// selenium.click("link=14. Web Services for Remote Portlets (WSRP)");
 		selenium.type(INPUT_CONSWSDL, address);
 		selenium.click(SUBMIT_REFRESHSAVE);
 		selenium.waitForPageToLoad(PAGE_LOAD);

Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java	2008-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java	2008-09-26 15:12:22 UTC (rev 11998)
@@ -16,7 +16,7 @@
 
 	private static final String SUBMIT_RENAME_PORTAL = "renameForm:rename";
 	private static final String INPUT_RENAME_PORTAL = "renameForm:newName";
-	private static final String SUBMIT_DELETE_PORTAL_CONF = "_id29jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:confirm-form:delete";
+	private static final String SUBMIT_DELETE_PORTAL_CONF = "delete-view:confirm-form:delete";
 	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";
@@ -25,7 +25,7 @@
 	private final String TAB_PORTALOBJ_ID = "//div[@id='current']/a";
 
 	private final String LINK_PORTALS_ID = "link=*Portal Objects*";
-	private final String LINK_PORTAL_HOME = "_id8jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id11jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
+	private final String LINK_PORTAL_HOME = "obj-temp-form:object-link-0";
 
 	private final String TABLE_PORTAL_ADMIN = "obj-nav-form:portal-datatable";
 	private final String POR_TL_MAIN = "obj-nav-form:portal-datatable:{0}:object-iid-link";
@@ -62,6 +62,7 @@
 		selenium.click("link=Admin");
 		selenium.waitForPageToLoad(PAGE_LOAD);
 
+		
 		clickIfVisible(TAB_PORTALOBJ_ID);
 		clickIfVisible(LINK_PORTALS_ID);
 
@@ -237,7 +238,45 @@
 		Assert.assertTrue(selenium.isTextPresent("Current users"));
 
 	}
+	
+	@Test(enabled = true, dependsOnMethods={"testPortalCreate"})
+	public void testPageRename(){
+		String portalName = "TestPortal";
+		String pageName = "PageToRename";
+		
+		createPage("TestPortal", "PageToRename");
+		
+		openAndWait("/portal");
+		clickAndWait("link=Admin");
 
+		clickIfVisible(TAB_PORTALOBJ_ID);
+		clickIfVisible(LINK_PORTALS_ID, "Create a portal named:");
+
+		int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
+
+		clickAndWait(MessageFormat.format(POR_TL_MAIN, r));
+
+		r = findTableRow(TABLE_PORTALPAGE_ADMIN, pageName, 0) - 1;
+
+		clickAndWait(MessageFormat.format(PAG_TL_RENAME, r));
+
+	}
+
+	@Test(enabled = false)
+	public void testPageSecurity(){
+		
+	}
+	
+	@Test(enabled = false)
+	public void testPageTheme(){
+		
+	}
+	
+	@Test(enabled = false)
+	public void testPageLayout(){
+		
+	}
+	
 	private void createPortal(String name) {
 		selenium.open("/portal/");
 		selenium.waitForPageToLoad(PAGE_LOAD);




More information about the portal-commits mailing list