gatein SVN: r6619 - in portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium: candidate and 1 other directory.
by do-not-reply＠jboss.org
Author: arthurpeltier
Date: 2011-06-09 07:31:30 -0400 (Thu, 09 Jun 2011)
New Revision: 6619
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_002_SignInByAdminAccount.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_004_CheckFinishFunctionAfterEditContainerOfNodePage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_01_014_CreateNewAccountWithPasswordAndConfirmPasswordOver30Characters.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_03_003_EditLastNameOfUserInCommunityManagement.html
Log:
TESTVN-3439
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_002_SignInByAdminAccount.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_002_SignInByAdminAccount.html 2011-06-09 10:58:06 UTC (rev 6618)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_002_SignInByAdminAccount.html 2011-06-09 11:31:30 UTC (rev 6619)
@@ -34,7 +34,7 @@
<tr>
<td>waitForElementPresent</td>
<td>username</td>
- <td>root</td>
+ <td></td>
</tr>
<tr>
<td>type</td>
@@ -57,6 +57,16 @@
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Logout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-06-09 10:58:06 UTC (rev 6618)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-06-09 11:31:30 UTC (rev 6619)
@@ -57,6 +57,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Site</td>
<td></td>
@@ -437,6 +442,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td>
+ <td></td>
+</tr>
+<tr>
<td>mouseOver</td>
<td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td>
<td></td>
@@ -467,18 +477,28 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='PortletIcon AcrobatFile']</td>
+ <td></td>
+</tr>
+<tr>
<td>mouseOver</td>
<td>//div[@class='PortletIcon AcrobatFile']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[4]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[text()='Test_SNF_PRL_26']/ancestor::div/a[@title='Delete Portlet']</td>
<td></td>
</tr>
<tr>
+ <td>mouseOver</td>
+ <td>//div[text()='Test_SNF_PRL_26']/ancestor::div/a[@title='Delete Portlet']</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
- <td>//div[4]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[text()='Test_SNF_PRL_26']/ancestor::div/a[@title='Delete Portlet']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html 2011-06-09 10:58:06 UTC (rev 6618)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html 2011-06-09 11:31:30 UTC (rev 6619)
@@ -42,6 +42,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Group</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Group</td>
<td></td>
@@ -52,16 +57,31 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Group</td>
+ <td></td>
+</tr>
+<tr>
<td>mouseOver</td>
<td>link=Group</td>
<td></td>
</tr>
<tr>
- <td>verifyElementPositionTop</td>
- <td>link=Organization</td>
- <td>104</td>
+ <td>echo</td>
+ <td>-- Current postion : link=Organization</td>
+ <td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[4]/div/div[1]/a[text()='Organization']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementPresent</td>
+ <td>//div[4]/div/div[1]/a[text()='Organization']</td>
+ <td></td>
+</tr>
+<tr>
<td>mouseOver</td>
<td>link=New Staff</td>
<td></td>
@@ -112,11 +132,21 @@
<td></td>
</tr>
<tr>
- <td>verifyElementPositionTop</td>
- <td>link=Organization</td>
- <td>104</td>
+ <td>echo</td>
+ <td>-- New postion : link=Organization</td>
+ <td></td>
</tr>
<tr>
+ <td>verifyElementNotPresent</td>
+ <td>//div[4]/div/div[1]/a[text()='Organization']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementPresent</td>
+ <td>//div[2]/div/div[1]/a[text()='Organization']</td>
+ <td></td>
+</tr>
+<tr>
<td>echo</td>
<td>-- Return to default priority--</td>
<td></td>
@@ -127,6 +157,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Properties</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Edit Properties</td>
<td></td>
@@ -152,21 +187,26 @@
<td></td>
</tr>
<tr>
- <td>verifyElementPositionTop</td>
- <td>link=Organization</td>
- <td>53</td>
+ <td>waitForElementPresent</td>
+ <td>//div[4]/div/div[1]/a[text()='Organization']</td>
+ <td></td>
</tr>
<tr>
- <td>mouseOver</td>
- <td>link=New Staff</td>
+ <td>verifyElementPresent</td>
+ <td>//div[4]/div/div[1]/a[text()='Organization']</td>
<td></td>
</tr>
<tr>
- <td>mouseOver</td>
- <td>link=Users and groups management</td>
+ <td>verifyElementNotPresent</td>
+ <td>//div[2]/div/div[1]/a[text()='Organization']</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-06-09 10:58:06 UTC (rev 6618)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-06-09 11:31:30 UTC (rev 6619)
@@ -144,7 +144,7 @@
<tr>
<td>type</td>
<td>searchTerm</td>
- <td>Community Management</td>
+ <td>New Account</td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -217,21 +217,16 @@
<td></td>
</tr>
<tr>
- <td>waitForLocation</td>
- <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_45</td>
+ <td>echo</td>
+ <td>-- Edit this node--</td>
<td></td>
</tr>
<tr>
- <td>assertLocation</td>
- <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_45</td>
+ <td>waitForElementPresent</td>
+ <td>link=Group</td>
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>-- Edit this node--</td>
- <td></td>
-</tr>
-<tr>
<td>clickAndWait</td>
<td>link=Group</td>
<td></td>
@@ -253,12 +248,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_45']</td>
+ <td>//a[contains(@onmousedown,'Test_SNF_PRL_45')]</td>
<td></td>
</tr>
<tr>
<td>mouseDownRight</td>
- <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_45']</td>
+ <td>//a[contains(@onmousedown,'Test_SNF_PRL_45')]</td>
<td></td>
</tr>
<tr>
@@ -403,12 +398,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_45_edit']</td>
+ <td>//a[@title='Test_SNF_PRL_45_edit']</td>
<td></td>
</tr>
<tr>
<td>mouseDownRight</td>
- <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_45_edit']</td>
+ <td>//a[@title='Test_SNF_PRL_45_edit']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-06-09 10:58:06 UTC (rev 6618)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-06-09 11:31:30 UTC (rev 6619)
@@ -129,7 +129,7 @@
<tr>
<td>type</td>
<td>searchTerm</td>
- <td>Community Management</td>
+ <td>New Account</td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -294,7 +294,7 @@
<tr>
<td>verifyElementPresent</td>
<td>//div[@class="PortletIcon PortletIcon"]</td>
- <td>Community Management</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -349,7 +349,7 @@
<tr>
<td>verifyElementPresent</td>
<td>//div[@class="PortletIcon PortletIcon"]</td>
- <td>Container</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -367,12 +367,12 @@
<td></td>
</tr>
<tr>
- <td>mouseOver</td>
+ <td>waitForElementPresent</td>
<td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
+ <td>mouseOver</td>
<td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
<td></td>
</tr>
@@ -498,7 +498,7 @@
</tr>
<tr>
<td>assertConfirmation</td>
- <td>Are you sure you want to delete this portlet?</td>
+ <td>Are you sure you want to delete this Container?</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html 2011-06-09 10:58:06 UTC (rev 6618)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html 2011-06-09 11:31:30 UTC (rev 6619)
@@ -57,6 +57,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=New Staff</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=New Staff</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_004_CheckFinishFunctionAfterEditContainerOfNodePage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_004_CheckFinishFunctionAfterEditContainerOfNodePage.html 2011-06-09 10:58:06 UTC (rev 6618)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_004_CheckFinishFunctionAfterEditContainerOfNodePage.html 2011-06-09 11:31:30 UTC (rev 6619)
@@ -52,11 +52,21 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Application Registry</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Application Registry</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Add New Page</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Add New Page</td>
<td></td>
@@ -182,11 +192,16 @@
<td></td>
</tr>
<tr>
- <td>componentExoContextMenu</td>
+ <td>mouseDownRight</td>
<td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_POR_26_03_004']</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Node's Page</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Edit Node's Page</td>
<td></td>
@@ -247,32 +262,17 @@
<td></td>
</tr>
<tr>
- <td>click</td>
- <td>link=Sign out</td>
- <td></td>
-</tr>
-<tr>
<td>echo</td>
<td>-- Delete this node--</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Administrator</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>link=Administrator</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>link=Group</td>
<td></td>
</tr>
<tr>
- <td>click</td>
+ <td>clickAndWait</td>
<td>link=Group</td>
<td></td>
</tr>
@@ -302,7 +302,7 @@
<td></td>
</tr>
<tr>
- <td>componentExoContextMenu</td>
+ <td>mouseDownRight</td>
<td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_POR_26_03_004']</td>
<td></td>
</tr>
@@ -317,16 +317,25 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Save</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_01_014_CreateNewAccountWithPasswordAndConfirmPasswordOver30Characters.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_01_014_CreateNewAccountWithPasswordAndConfirmPasswordOver30Characters.html 2011-06-09 10:58:06 UTC (rev 6618)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_01_014_CreateNewAccountWithPasswordAndConfirmPasswordOver30Characters.html 2011-06-09 11:31:30 UTC (rev 6619)
@@ -57,6 +57,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=New Staff</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=New Staff</td>
<td></td>
@@ -102,6 +107,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIAccountPortlet']/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>//div[@id='UIAccountPortlet']/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
<td></td>
@@ -161,7 +171,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_03_003_EditLastNameOfUserInCommunityManagement.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_03_003_EditLastNameOfUserInCommunityManagement.html 2011-06-09 10:58:06 UTC (rev 6618)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_03_003_EditLastNameOfUserInCommunityManagement.html 2011-06-09 11:31:30 UTC (rev 6619)
@@ -727,6 +727,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
13 years, 6 months
- 1
- 0
gatein SVN: r6618 - epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-06-09 06:58:06 -0400 (Thu, 09 Jun 2011)
New Revision: 6618
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
Log:
JBEPP-854 Portlet's context-root cannot contain slashes
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2011-06-09 10:25:15 UTC (rev 6617)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2011-06-09 10:58:06 UTC (rev 6618)
@@ -125,9 +125,9 @@
@Override
public PortletContext getProducerOfferedPortletContext(String applicationState)
{
- String[] chunks = Utils.split("/", applicationState);
- String appName = chunks[0];
- String portletName = chunks[1];
+ int indexOfSeparator = applicationState.lastIndexOf("/");
+ String appName = applicationState.substring(0, indexOfSeparator);
+ String portletName = applicationState.substring(indexOfSeparator + 1);
return PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + "./" + appName + "."
+ portletName);
}
13 years, 6 months
- 1
- 0
gatein SVN: r6617 - epp/portal/branches/EPP-5-1-tmp/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-06-09 06:25:15 -0400 (Thu, 09 Jun 2011)
New Revision: 6617
Modified:
epp/portal/branches/EPP-5-1-tmp/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
Log:
JBEPP-854 Portlet's context-root cannot contain slashes
Modified: epp/portal/branches/EPP-5-1-tmp/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2011-06-09 10:05:17 UTC (rev 6616)
+++ epp/portal/branches/EPP-5-1-tmp/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2011-06-09 10:25:15 UTC (rev 6617)
@@ -125,9 +125,9 @@
@Override
public PortletContext getProducerOfferedPortletContext(String applicationState)
{
- String[] chunks = Utils.split("/", applicationState);
- String appName = chunks[0];
- String portletName = chunks[1];
+ int indexOfSeparator = applicationState.lastIndexOf("/");
+ String appName = applicationState.substring(0, indexOfSeparator);
+ String portletName = applicationState.substring(indexOfSeparator + 1);
return PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + "./" + appName + "."
+ portletName);
}
13 years, 6 months
- 1
- 0
gatein SVN: r6616 - portal/branches/branch-GTNPORTAL-1921/webui/portal/src/main/java/org/exoplatform/portal/webui/login.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-06-09 06:05:17 -0400 (Thu, 09 Jun 2011)
New Revision: 6616
Modified:
portal/branches/branch-GTNPORTAL-1921/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIResetPassword.java
Log:
GTNPORTAL-1893: Update Java code to not store tokenID in a static variable of UIResetPassword class
Modified: portal/branches/branch-GTNPORTAL-1921/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIResetPassword.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1921/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIResetPassword.java 2011-06-09 03:20:55 UTC (rev 6615)
+++ portal/branches/branch-GTNPORTAL-1921/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIResetPassword.java 2011-06-09 10:05:17 UTC (rev 6616)
@@ -58,7 +58,7 @@
static User user_;
- private static String tokenId;
+ private String tokenId;
public UIResetPassword() throws Exception
{
@@ -79,9 +79,14 @@
public void setTokenId(String tokenId)
{
- UIResetPassword.tokenId = tokenId;
+ this.tokenId = tokenId;
}
+ public String getTokenId()
+ {
+ return this.tokenId;
+ }
+
@Override
public void reset()
{
@@ -113,7 +118,7 @@
setPassword = false;
}
- Token token = tokenService.getToken(tokenId);
+ Token token = tokenService.getToken(uiForm.getTokenId());
// Making sure a token exist
if (token == null || token.isExpired())
{
@@ -129,7 +134,7 @@
uiMaskWorkspace.setWindowSize(-1, -1);
uiApp.addMessage(new ApplicationMessage("UIResetPassword.msg.change-password-successfully", null));
- tokenService.deleteToken(tokenId);
+ tokenService.deleteToken(uiForm.getTokenId());
}
event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWorkspace);
}
13 years, 6 months
- 1
- 0
gatein SVN: r6615 - in epp/docs/branches/5.1/Site_Publisher/User_Guide: en-US and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-06-08 23:20:55 -0400 (Wed, 08 Jun 2011)
New Revision: 6615
Modified:
epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Introduction.xml
epp/docs/branches/5.1/Site_Publisher/User_Guide/publican.cfg
Log:
Simplifying cross-company build
Modified: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Introduction.xml
===================================================================
--- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Introduction.xml 2011-06-08 21:20:14 UTC (rev 6614)
+++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Introduction.xml 2011-06-09 03:20:55 UTC (rev 6615)
@@ -6,17 +6,8 @@
<chapter id="chap-User_Guide-Product_Introduction">
<title>Product Introduction</title>
- <xi:include href="Site_Publisher.xml" xmlns:xi="http://www.w3.org/2001/XInclude" >
- <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="eXo_Content.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="Site_Publisher.xml" xmlns:xi="http://www.w3.org/2001/XInclude" >
- </xi:include>
- </xi:fallback>
- </xi:include>
- </xi:fallback>
- </xi:include>
-
+ <xi:include condition="exo" href="eXo_Content.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
<section id="sect-User_Guide-Product_Introduction-Site_Content_Structure">
<title>Site Content Structure</title>
<para>
Modified: epp/docs/branches/5.1/Site_Publisher/User_Guide/publican.cfg
===================================================================
--- epp/docs/branches/5.1/Site_Publisher/User_Guide/publican.cfg 2011-06-08 21:20:14 UTC (rev 6614)
+++ epp/docs/branches/5.1/Site_Publisher/User_Guide/publican.cfg 2011-06-09 03:20:55 UTC (rev 6615)
@@ -7,6 +7,4 @@
debug:1
toc_section_depth:10
max_image_width:660
-
-
-
+condition: redhat
\ No newline at end of file
13 years, 6 months
- 1
- 0
gatein SVN: r6614 - epp/portal/tags.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-06-08 17:20:14 -0400 (Wed, 08 Jun 2011)
New Revision: 6614
Added:
epp/portal/tags/EPP_5_1_1_DEV02/
Log:
Release EPP 5.1.1 DEV02
13 years, 6 months
- 1
- 0
gatein SVN: r6613 - portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-06-08 06:42:38 -0400 (Wed, 08 Jun 2011)
New Revision: 6613
Modified:
portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java
Log:
GTNPORTAL-1910 UIFormCheckBoxInput.setValue() doesn't parse String
Modified: portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-06-08 09:48:07 UTC (rev 6612)
+++ portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-06-08 10:42:38 UTC (rev 6613)
@@ -73,6 +73,10 @@
{
checked = boolean.class.cast(value);
}
+ else if (value instanceof String)
+ {
+ checked = Boolean.parseBoolean((String)value);
+ }
typeValue_ = (Class<T>)value.getClass();
return super.setValue(value);
}
13 years, 6 months
- 1
- 0
gatein SVN: r6612 - in portal/branches/branch-GTNPORTAL-1921: testsuite/webuibasedsamples/src/main/webapp/WEB-INF/conf/sample/webui and 2 other directories.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-06-08 05:48:07 -0400 (Wed, 08 Jun 2011)
New Revision: 6612
Added:
portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/input/
portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/input/UIFormCheckBoxInput.java
Modified:
portal/branches/branch-GTNPORTAL-1921/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java
portal/branches/branch-GTNPORTAL-1921/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/conf/sample/webui/configuration.xml
portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java
Log:
GTNPORTAL-1916 New UIFormCheckBoxInput component with more constraint in API and better implementation
Modified: portal/branches/branch-GTNPORTAL-1921/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1921/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java 2011-06-08 09:09:21 UTC (rev 6611)
+++ portal/branches/branch-GTNPORTAL-1921/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java 2011-06-08 09:48:07 UTC (rev 6612)
@@ -33,7 +33,7 @@
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
import org.exoplatform.webui.form.UIForm;
-import org.exoplatform.webui.form.UIFormCheckBoxInput;
+import org.exoplatform.webui.form.input.UIFormCheckBoxInput;
import org.exoplatform.webui.form.UIFormDateTimeInput;
import org.exoplatform.webui.form.UIFormInput;
import org.exoplatform.webui.form.UIFormInputSet;
@@ -109,7 +109,7 @@
List<SelectItemOption<String>> selectItemOptions = makeSelectItemOptions();
inputSet.addUIFormInput(new UIFormSelectBox(POSITION, null, selectItemOptions));
- inputSet.addUIFormInput(new UIFormCheckBoxInput<String>(RECEIVE_EMAIL, null, "test"));
+ inputSet.addUIFormInput(new UIFormCheckBoxInput(RECEIVE_EMAIL, null, false));
List<SelectItemOption<String>> comboBoxItemOptions = new ArrayList<SelectItemOption<String>>();
comboBoxItemOptions.add(new SelectItemOption<String>(("VI")));
@@ -220,7 +220,7 @@
UISampleUIForm uiForm = event.getSource();
String userName = uiForm.getUIStringInput(USERNAME).getValue();
String password = uiForm.getUIStringInput(PASSWORD).getValue();
- boolean receiveEmail = uiForm.getUIFormCheckBoxInput(RECEIVE_EMAIL).isChecked();
+ boolean receiveEmail = uiForm.<UIFormCheckBoxInput>getUIInput(RECEIVE_EMAIL).isChecked();
String favoriteColor = (String)uiForm.getUIInput(FAVORITE_COLOR).getValue();
String position = (String)uiForm.getUIInput(POSITION).getValue();
String gender = (String)uiForm.getUIInput(GENDER).getValue();
Modified: portal/branches/branch-GTNPORTAL-1921/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/conf/sample/webui/configuration.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1921/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/conf/sample/webui/configuration.xml 2011-06-08 09:09:21 UTC (rev 6611)
+++ portal/branches/branch-GTNPORTAL-1921/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/conf/sample/webui/configuration.xml 2011-06-08 09:48:07 UTC (rev 6612)
@@ -26,8 +26,7 @@
<application>
<ui-component-root>org.exoplatform.sample.webui.component.UISamplePortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
- <application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
+ <application-lifecycle-listeners>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-06-08 09:09:21 UTC (rev 6611)
+++ portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-06-08 09:48:07 UTC (rev 6612)
@@ -19,17 +19,19 @@
package org.exoplatform.webui.form;
+import java.io.Writer;
+
+import org.exoplatform.commons.serialization.api.annotations.Serialized;
import org.exoplatform.webui.application.WebuiRequestContext;
-import org.exoplatform.commons.serialization.api.annotations.Serialized;
-import java.io.Writer;
-
/**
* Represents a checkbox field.
* @param <T> The type of value that is expected
+ * @deprecated use {@link org.exoplatform.webui.form.input.UIFormCheckBoxInput} instead
*/
@SuppressWarnings("hiding")
@Serialized
+@Deprecated
public class UIFormCheckBoxInput<T> extends UIFormInputBase<T>
{
/**
Added: portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/input/UIFormCheckBoxInput.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/input/UIFormCheckBoxInput.java (rev 0)
+++ portal/branches/branch-GTNPORTAL-1921/webui/core/src/main/java/org/exoplatform/webui/form/input/UIFormCheckBoxInput.java 2011-06-08 09:48:07 UTC (rev 6612)
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2011 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.webui.form.input;
+
+import java.io.Writer;
+
+import org.exoplatform.commons.serialization.api.annotations.Serialized;
+import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.form.UIForm;
+import org.exoplatform.webui.form.UIFormInput;
+import org.exoplatform.webui.form.UIFormInputBase;
+
+/**
+ * @author <a href="mailto:phuong.vu@exoplatform.com">Vu Viet Phuong</a>
+ * @version $Id$
+ *
+ * <p>Represent an html checkbox input <br/>
+ * This class is a replacement for {@link org.exoplatform.webui.form.UIFormCheckBoxInput} <br/>
+ * Still support raising event when user click the checkbox, but now we only accept boolean value. </p>
+ */
+@Serialized
+public class UIFormCheckBoxInput extends UIFormInputBase<Boolean>
+{
+ /**
+ * Name of {@link org.exoplatform.webui.event.EventListener} that will be fired when checkbox state is changed
+ */
+ private String onchange_;
+
+ /**
+ * Id of {@link org.exoplatform.webui.core.UIComponent} that is configured with the fired event
+ * This component must be in the same form with the checkbox
+ * If this field is null, event of the UIForm will be fire instead
+ */
+ private String componentEvent_ = null;
+
+ public UIFormCheckBoxInput()
+ {
+ this(null, null, false);
+ }
+
+ public UIFormCheckBoxInput(String name, String bindingExpression, Boolean value)
+ {
+ super(name, bindingExpression, Boolean.class);
+ setValue(value);
+ }
+
+ public UIFormInput setValue(Boolean value)
+ {
+ if (value == null)
+ {
+ value = false;
+ }
+
+ return super.setValue(value);
+ }
+
+ /**
+ * This method is used to make the action more meaning in the context of a checkbox
+ */
+ public boolean isChecked()
+ {
+ return getValue();
+ }
+
+ /**
+ * This method is used to make the action more meaning in the context of a checkbox
+ */
+ public UIFormCheckBoxInput setChecked(boolean check)
+ {
+ return (UIFormCheckBoxInput)setValue(check);
+ }
+
+ public void setOnChange(String onchange)
+ {
+ onchange_ = onchange;
+ }
+
+ public void setComponentEvent(String com)
+ {
+ componentEvent_ = com;
+ }
+
+ public void setOnChange(String event, String com)
+ {
+ this.onchange_ = event;
+ this.componentEvent_ = com;
+ }
+
+ public String renderOnChangeEvent(UIForm uiForm) throws Exception
+ {
+ if (componentEvent_ == null)
+ return uiForm.event(onchange_, null);
+ return uiForm.event(onchange_, componentEvent_, (String)null);
+ }
+
+ public void decode(Object input, WebuiRequestContext context) throws Exception
+ {
+ if (!isEnable())
+ return;
+
+ if (input == null || "false".equals(input.toString()))
+ {
+ setValue(false);
+ }
+ else
+ {
+ setValue(true);
+ }
+ }
+
+ public void processRender(WebuiRequestContext context) throws Exception
+ {
+ Writer w = context.getWriter();
+ w.write("<input type='checkbox' name='");
+ w.write(name);
+ w.write("'");
+ if (onchange_ != null)
+ {
+ UIForm uiForm = getAncestorOfType(UIForm.class);
+ w.append(" onclick=\"").append(renderOnChangeEvent(uiForm)).append("\"");
+ }
+ if (isChecked())
+ w.write(" checked");
+ if (!enable_)
+ w.write(" disabled");
+ w.write(" class='checkbox'/>");
+ if (this.isMandatory())
+ w.write(" *");
+ }
+
+}
\ No newline at end of file
13 years, 6 months
- 1
- 0
gatein SVN: r6611 - in epp/portal/branches/EPP-5-1-tmp/distribution: ear and 3 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-06-08 05:09:21 -0400 (Wed, 08 Jun 2011)
New Revision: 6611
Modified:
epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml
epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml
epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml
epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml
epp/portal/branches/EPP-5-1-tmp/distribution/sso/
epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml
Log:
Tuning dependencies
Modified: epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml 2011-06-08 07:17:56 UTC (rev 6610)
+++ epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml 2011-06-08 09:09:21 UTC (rev 6611)
@@ -78,6 +78,10 @@
<artifactId>jaxws-api</artifactId>
<groupId>javax.xml.ws</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>jbossxb</artifactId>
+ <groupId>org.jboss</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -637,6 +641,10 @@
<artifactId>stax-api</artifactId>
<groupId>stax</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -839,6 +847,28 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
</dependency>
@@ -956,6 +986,8 @@
</exclusion>
</exclusions>
</dependency>
+
+ <!-- wsrp libs -->
<dependency>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-producer-lib</artifactId>
@@ -1000,6 +1032,10 @@
<artifactId>jaxb-api</artifactId>
<groupId>sun-jaxb</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>apache-xerces</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1026,6 +1062,14 @@
<artifactId>jbossxb</artifactId>
<groupId>org.jboss</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>slf4j-jdk14</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1057,20 +1101,7 @@
</exclusions>
</dependency>
- <!-- wsrp libs -->
- <dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-producer-lib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-consumer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-integration-api</artifactId>
- </dependency>
-
+
<!-- Chromattic -->
<dependency>
<groupId>org.chromattic</groupId>
@@ -1285,6 +1316,20 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jbosscache2</artifactId>
<version>3.3.2.GA</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jta</artifactId>
+ <groupId>javax.transaction</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hibernate-core</artifactId>
+ <groupId>org.hibernate</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- needed so that GTN can be run on the IBM jdk, to be removed when the IBM jdk no longer needs this hack -->
<dependency>
@@ -1304,7 +1349,42 @@
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
<version>3.2.7.GA</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-transaction-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-common-core</artifactId>
+ <groupId>org.jboss</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
+
+ <dependency>
+ <artifactId>slf4j-jdk14</artifactId>
+ <groupId>org.slf4j</groupId>
+ <type>jar</type>
+ <version>1.5.6</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm</artifactId>
+ <groupId>asm</groupId>
+ <type>jar</type>
+ <version>1.5.3</version>
+ </dependency>
</dependencies>
<build>
Modified: epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-06-08 07:17:56 UTC (rev 6610)
+++ epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-06-08 09:09:21 UTC (rev 6611)
@@ -18,11 +18,16 @@
<eap.version>5.1.0</eap.version>
<eap.dir>jboss-eap-5.1</eap.dir>
<epp.dir>jboss-epp-5.1.1</epp.dir>
+
+ <sso.version>1.0.2-epp-DEV01</sso.version>
</properties>
<modules>
- <module>integration.war</module>
- <module>ear</module>
+<!-- <module>integration.war</module>
+ <module>ear</module>-->
+ <module>serverAddon</module>
+ <module>portletbridge</module>
+<!-- <module>sso</module>-->
</modules>
<!-- NOTE: These dependency declarations are only required to sort this project to the
@@ -45,18 +50,21 @@
<type>ear</type>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet.web</artifactId>
<version>5.1.1-epp-CR01-SNAPSHOT</version>
<type>war</type>
</dependency>
+-->
+<!--
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet.dashboard</artifactId>
<version>5.1.1-epp-CR01-SNAPSHOT</version>
<type>war</type>
</dependency>
+-->
<dependency>
<groupId>org.exoplatform.portal.distribution</groupId>
<artifactId>portletbridge</artifactId>
@@ -64,7 +72,20 @@
<classifier>bin</classifier>
<type>zip</type>
</dependency>
-
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-packaging</artifactId>
+ <version>${sso.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal.deploy</groupId>
+ <artifactId>serverAddon</artifactId>
+ <version>${project.version}</version>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </dependency>
+
<!-- EAP overlay -->
<dependency>
<groupId>org.jboss</groupId>
@@ -131,7 +152,8 @@
</execution>
</executions>
</plugin>
-<!-- <plugin>
+
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<executions>
@@ -143,12 +165,52 @@
</goals>
<configuration>
<target>
- <move file="${project.build.directory}/${project.build.finalName}-bin/${eap.dir}" toFile="${project.build.directory}/${project.build.finalName}-bin/${epp.dir}"/>
+ <property name="epp.path">${project.build.directory}/${project.build.finalName}-bin/${epp.dir}</property>
+ <property name="eap.path">${project.build.directory}/${project.build.finalName}-bin/${eap.dir}</property>
+
+ <move file="${eap.path}" toFile="${epp.path}"/>
+ <move file="${epp.path}/gatein-sso-${sso.version}" toFile="${epp.path}/gatein-sso"/>
+
+ <ant antfile="src/build.xml" inheritRefs="true">
+ <target name="patch"/>
+ <property name="toConfiguration" value="default"/>
+ </ant>
+
+ <ant antfile="src/build.xml" inheritRefs="true">
+ <target name="patch"/>
+ <property name="toConfiguration" value="production"/>
+ </ant>
+
+ <ant antfile="src/build.xml" inheritRefs="true">
+ <target name="patch"/>
+ <property name="toConfiguration" value="all"/>
+ </ant>
+
</target>
</configuration>
</execution>
</executions>
+ </plugin>
+
+
+<!-- <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distro-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/zip.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
</plugin>-->
+
</plugins>
</build>
</project>
\ No newline at end of file
Modified: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml 2011-06-08 07:17:56 UTC (rev 6610)
+++ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml 2011-06-08 09:09:21 UTC (rev 6611)
@@ -13,7 +13,7 @@
</parent>-->
<artifactId>serverAddon</artifactId>
<packaging>pom</packaging>
- <name>Distribution portletbridge</name>
+ <name>Deploy serverAddon</name>
<groupId>org.exoplatform.portal.deploy</groupId>
<version>5.1.1-epp-CR01-SNAPSHOT</version>
Modified: epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-06-08 07:17:56 UTC (rev 6610)
+++ epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-06-08 09:09:21 UTC (rev 6611)
@@ -48,24 +48,56 @@
</dependencySet>-->
<!-- Resources - gateinds.xml, gatein-sample-portal-ds.xml -->
+ <!--
+removeEverywhere = ["hibernate-core-3.3.2.GA.jar", "jaxb-api-2.1.jar","stax-api-1.0.jar"]
+removeFromCluster = ["hibernate-jbosscache2-3.3.2.GA.jar", "jbosscache-core-3.2.6.GA.jar", "jgroups-2.6.13.GA.jar"]
+
+ -->
<dependencySet>
<includes>
<include>*.deploy:*:zip</include>
</includes>
+ <excludes>
+ <exclude>*:hibernate-core:3.3.2.GA:jar</exclude>
+ <exclude>*:jaxb-api:2.1:jar</exclude>
+ <exclude>*:stax-api:1.0:jar</exclude>
+ </excludes>
<outputDirectory>${eap.dir}/jboss-as/server/default</outputDirectory>
<unpack>true</unpack>
</dependencySet>
+
<dependencySet>
<includes>
<include>*.deploy:*:zip</include>
</includes>
+ <excludes>
+ <exclude>*:hibernate-core:3.3.2.GA:jar</exclude>
+ <exclude>*:jaxb-api:2.1:jar</exclude>
+ <exclude>*:stax-api:1.0:jar</exclude>
+
+ <!-- Exclude cluster -->
+ <exclude>*:hibernate-jbosscache2:3.3.2.GA:jar</exclude>
+ <exclude>*:jbosscache-core:3.2.6.GA:jar</exclude>
+ <exclude>*:jgroups:2.6.13.GA:jar</exclude>
+ </excludes>
<outputDirectory>${eap.dir}/jboss-as/server/all</outputDirectory>
<unpack>true</unpack>
</dependencySet>
+
<dependencySet>
<includes>
<include>*.deploy:*:zip</include>
</includes>
+ <excludes>
+ <exclude>*:hibernate-core:3.3.2.GA:jar</exclude>
+ <exclude>*:jaxb-api:2.1:jar</exclude>
+ <exclude>*:stax-api:1.0:jar</exclude>
+
+ <!-- Exclude cluster -->
+ <exclude>*:hibernate-jbosscache2:3.3.2.GA:jar</exclude>
+ <exclude>*:jbosscache-core:3.2.6.GA:jar</exclude>
+ <exclude>*:jgroups:2.6.13.GA:jar</exclude>
+ </excludes>
<outputDirectory>${eap.dir}/jboss-as/server/production</outputDirectory>
<unpack>true</unpack>
</dependencySet>
Property changes on: epp/portal/branches/EPP-5-1-tmp/distribution/sso
___________________________________________________________________
Added: svn:ignore
+ target
Modified: epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml 2011-06-08 07:17:56 UTC (rev 6610)
+++ epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml 2011-06-08 09:09:21 UTC (rev 6611)
@@ -13,14 +13,14 @@
</parent>-->
<artifactId>sso</artifactId>
<packaging>pom</packaging>
- <name>Distribution portletbridge</name>
+ <name>Distribution sso</name>
<groupId>org.exoplatform.portal.distribution</groupId>
<version>5.1.1-epp-CR01-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.jboss.portletbridge</groupId>
+ <groupId>org.gatein.sso</groupId>
<artifactId>sso-packaging</artifactId>
<version>1.0.2-epp-DEV01</version>
<type>zip</type>
@@ -71,7 +71,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>distro-portalbridge-assembly</id>
+ <id>bin</id>
<phase>package</phase>
<goals>
<goal>single</goal>
13 years, 6 months
- 1
- 0
gatein SVN: r6610 - in portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium: candidate and 1 other directory.
by do-not-reply＠jboss.org
Author: arthurpeltier
Date: 2011-06-08 03:17:56 -0400 (Wed, 08 Jun 2011)
New Revision: 6610
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_002_SignInByAdminAccount.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_003_SignInByNormalAccount.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_004_SignInWithBlankUserNameAndPassword.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_005_SignInByUnregisteredUserName.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_008_SignInByClickTheseAcoountOnHomepage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_06_002_ChangeSkinForUser.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_017_CreatPortal_WithLimitOfAccessUsers.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_11_002_CheckWhenChangeToPortalThatIsNotPublic.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_04_006_CutPasteSystemNode.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_012_CompleteStep1InCreatePageAtTheSameLevelWithSameNodeNameButDifferentByLowerUpperCase.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_046_CreatePagesAtTheSameLevelWithSameNodeName.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_047_CreateANewPageWithNodeNameIsTheSameWithExistingNodeNameAtTheSameLevel.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_21_002_EditPageWhenUserHasRightToAccessButCanNotEditPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_22_022_CheckChangesAfterEditPagePropertiesWithFinish.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_010_AddNewNodeWithNameIsTheSameWithExistingOneInTheSameLevelIn1Navigation.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_06_001_DeleteNodeWithDeletingConfirmation.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_009_CheckFinishFunctionAfterChangeNodePageContainerLayout.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_01_002_CheckUpdatingUsersListAfterRegisterNewOne.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_03_003_EditLastNameOfUserInCommunityManagement.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_05_01_008_AddCategoryWithNameTheSameWithExistingButDifferentByUpperLowerCase.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_05_06_004_LimitAccessRightInNonPublicCategoryGroupMembershipCategoryAreDifferent.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_09_001_CheckSiteMapPortlet.html
Log:
TESTVN-3439:
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_002_SignInByAdminAccount.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_002_SignInByAdminAccount.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_002_SignInByAdminAccount.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -34,7 +34,7 @@
<tr>
<td>waitForElementPresent</td>
<td>username</td>
- <td></td>
+ <td>root</td>
</tr>
<tr>
<td>type</td>
@@ -48,30 +48,15 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>--Verify Root Accout</td>
+ <td>verifyTextPresent</td>
+ <td>Root Root</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>link=Root Root</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyElementPresent</td>
- <td>link=Root Root</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Sign out</td>
- <td></td>
-</tr>
-<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_003_SignInByNormalAccount.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_003_SignInByNormalAccount.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_003_SignInByNormalAccount.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,25 +48,15 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
+ <td>verifyText</td>
<td>link=Demo gtn</td>
- <td></td>
+ <td>Demo gtn</td>
</tr>
<tr>
- <td>verifyElementPresent</td>
- <td>link=Demo gtn</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Sign out</td>
- <td></td>
-</tr>
-<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
@@ -103,29 +93,20 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
+ <td>verifyText</td>
<td>link=Mary Kelly</td>
- <td></td>
+ <td>Mary Kelly</td>
</tr>
<tr>
- <td>verifyElementPresent</td>
- <td>link=Mary Kelly</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Sign out</td>
- <td></td>
-</tr>
-<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
+
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_004_SignInWithBlankUserNameAndPassword.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_004_SignInWithBlankUserNameAndPassword.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_004_SignInWithBlankUserNameAndPassword.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -34,7 +34,7 @@
<tr>
<td>waitForElementPresent</td>
<td>username</td>
- <td></td>
+ <td>root</td>
</tr>
<tr>
<td>type</td>
@@ -43,63 +43,38 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/</td>
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>--Sign in with blank password</td>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
<td></td>
</tr>
<tr>
- <td>waitForTextPresent</td>
- <td>Sign in failed. Wrong username or password.</td>
+ <td>echo</td>
+ <td>--Sign in with blank username</td>
<td></td>
</tr>
<tr>
- <td>verifyTextPresent</td>
- <td>Sign in failed. Wrong username or password.</td>
- <td></td>
-</tr>
-<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
<td>link=Sign in</td>
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>--Sign in with blank username</td>
- <td></td>
-</tr>
-<tr>
<td>type</td>
<td>password</td>
<td>gtn</td>
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/</td>
<td></td>
</tr>
<tr>
- <td>waitForTextPresent</td>
- <td>Sign in failed. Wrong username or password.</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyTextPresent</td>
- <td>Sign in failed. Wrong username or password.</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>username</td>
- <td></td>
+ <td>root</td>
</tr>
<tr>
<td>type</td>
@@ -113,31 +88,16 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
+ <td>//div[@id='UIPortalLoginFormAction']/table/tbody/tr/td/div/div/div//a</td>
<td></td>
</tr>
<tr>
- <td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
+ <td>click</td>
+ <td>//div[@id='UIPortalLoginFormAction']/table/tbody/tr/td/div/div/div//a</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Root Root</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyElementPresent</td>
- <td>link=Root Root</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>-- Sign out</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
</tr>
@@ -146,6 +106,7 @@
<td>link=Sign out</td>
<td></td>
</tr>
+
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_005_SignInByUnregisteredUserName.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_005_SignInByUnregisteredUserName.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_005_SignInByUnregisteredUserName.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -34,7 +34,7 @@
<tr>
<td>type</td>
<td>username</td>
- <td></td>
+ <td>POR_01_005</td>
</tr>
<tr>
<td>type</td>
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/</td>
<td></td>
</tr>
<tr>
@@ -88,21 +88,6 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Root Root</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyElementPresent</td>
- <td>link=Root Root</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>-- Sign out</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
</tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_008_SignInByClickTheseAcoountOnHomepage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_008_SignInByClickTheseAcoountOnHomepage.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_01_008_SignInByClickTheseAcoountOnHomepage.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -27,11 +27,6 @@
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>--Login Root</td>
- <td></td>
-</tr>
-<tr>
<td>clickAndWait</td>
<td>link=Administrator</td>
<td></td>
@@ -52,11 +47,6 @@
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>--Login Manager</td>
- <td></td>
-</tr>
-<tr>
<td>clickAndWait</td>
<td>link=Manager</td>
<td></td>
@@ -77,11 +67,6 @@
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>--Login User</td>
- <td></td>
-</tr>
-<tr>
<td>clickAndWait</td>
<td>link=User</td>
<td></td>
@@ -102,11 +87,6 @@
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>--Login Demo</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
<td>link=Demo</td>
<td></td>
@@ -122,11 +102,6 @@
<td>Demo gtn</td>
</tr>
<tr>
- <td>echo</td>
- <td>--Sign out</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
@@ -136,6 +111,7 @@
<td>link=Sign out</td>
<td></td>
</tr>
+
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_06_002_ChangeSkinForUser.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_06_002_ChangeSkinForUser.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_06_002_ChangeSkinForUser.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -43,26 +43,11 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
<td></td>
</tr>
<tr>
<td>echo</td>
- <td>-- verify skin before change it</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='Default']</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyElementPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='Default']</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
<td>-- Change to Simple skin--</td>
<td></td>
</tr>
@@ -78,72 +63,42 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[text()='SimpleSkin']</td>
+ <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[2]/div/div/div</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[text()='SimpleSkin']</td>
+ <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[2]/div/div/div</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>link=Apply</td>
- <td></td>
-</tr>
-<tr>
<td>clickAndWait</td>
<td>link=Apply</td>
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>--Verify Change skin</td>
+ <td>waitForText</td>
+ <td>//div[@id='UIBreadcumbsPortlet']/div[1]/div/div/div/div[1]</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='SimpleSkin']</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyElementPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='SimpleSkin']</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementNotPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='Default']</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyElementNotPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='Default']</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Sign out</td>
- <td></td>
-</tr>
-<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>-- Check displaying skin when sign out--</td>
+ <td>verifyTitle</td>
+ <td>Home Page</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='Default']</td>
+ <td>echo</td>
+ <td>-- Check displaying skin when sign out-- </td>
<td></td>
</tr>
<tr>
- <td>verifyElementPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='Default']</td>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
<td></td>
</tr>
<tr>
@@ -173,7 +128,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
<td></td>
</tr>
<tr>
@@ -182,26 +137,11 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='SimpleSkin']</td>
+ <td>verifyTitle</td>
+ <td>Home Page</td>
<td></td>
</tr>
<tr>
- <td>verifyElementPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='SimpleSkin']</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementNotPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='Default']</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyElementNotPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='Default']</td>
- <td></td>
-</tr>
-<tr>
<td>echo</td>
<td>-- Return to Default skin --</td>
<td></td>
@@ -218,12 +158,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[text()='Default Style Skin']</td>
+ <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[text()='Default Style Skin']</td>
+ <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td>
<td></td>
</tr>
<tr>
@@ -232,30 +172,16 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='Default']</td>
- <td></td>
+ <td>waitForText</td>
+ <td>//div[@id='UIBreadcumbsPortlet']/div[1]/div/div/div/a</td>
+ <td>Home</td>
</tr>
<tr>
- <td>verifyElementPresent</td>
- <td>//div[@id='UIPortalApplication' and @class='Default']</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Login</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Sign out</td>
- <td></td>
-</tr>
-<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
+
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_017_CreatPortal_WithLimitOfAccessUsers.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_017_CreatPortal_WithLimitOfAccessUsers.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_017_CreatPortal_WithLimitOfAccessUsers.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -242,6 +242,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
@@ -386,7 +391,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -217,6 +217,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForLocation</td>
+ <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_45</td>
+ <td></td>
+</tr>
+<tr>
<td>assertLocation</td>
<td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_45</td>
<td></td>
@@ -243,21 +248,11 @@
</tr>
<tr>
<td>pause</td>
- <td>20000</td>
+ <td>5000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[2]/div/div/div[3]/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>//div[2]/div/div/div[3]/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_45']</td>
<td></td>
</tr>
@@ -408,16 +403,6 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_45_edit']</td>
<td></td>
</tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_11_002_CheckWhenChangeToPortalThatIsNotPublic.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_11_002_CheckWhenChangeToPortalThatIsNotPublic.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_11_002_CheckWhenChangeToPortalThatIsNotPublic.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,10 +48,15 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Site</td>
<td></td>
@@ -83,12 +88,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[text()='Properties']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[text()='Properties']</td>
<td></td>
</tr>
<tr>
@@ -98,12 +103,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[text()='Permission Setting']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[text()='Permission Setting']</td>
<td></td>
</tr>
<tr>
@@ -188,32 +193,32 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div[2]/div[1]/div/a</td>
+ <td>//div[@id='PermissionSelector']//a[text()='Administrators']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div[2]/div[1]/div/a</td>
+ <td>//div[@id='PermissionSelector']//a[text()='Administrators']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td>
+ <td>//div[@id='PermissionSelector']//a[@title='validator']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td>
+ <td>//div[@id='PermissionSelector']//a[@title='validator']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Save</td>
+ <td>//form[@id='UIPortalForm']/div[3]/div[2]/table/tbody/tr/td/div[1]/div/div/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>link=Save</td>
+ <td>//form[@id='UIPortalForm']/div[3]/div[2]/table/tbody/tr/td/div[1]/div/div/div/a</td>
<td></td>
</tr>
<tr>
@@ -316,7 +321,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -57,6 +57,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=New Staff</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=New Staff</td>
<td></td>
@@ -103,12 +108,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIAccountPortlet']//div[text()='User Profile']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIAccountPortlet']//div[text()='User Profile']</td>
<td></td>
</tr>
<tr>
@@ -152,6 +157,21 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIAccountPortlet']//div[text()='User Profile']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIAccountPortlet']//div[text()='User Profile']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Users and groups management</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Users and groups management</td>
<td></td>
@@ -567,11 +587,6 @@
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>link=Sign in</td>
<td></td>
@@ -612,6 +627,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site Editor</td>
+ <td></td>
+</tr>
+<tr>
<td>mouseOver</td>
<td>link=Site Editor</td>
<td></td>
@@ -647,11 +667,6 @@
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>link=Sign in</td>
<td></td>
@@ -677,6 +692,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Site</td>
<td></td>
@@ -876,7 +896,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_04_006_CutPasteSystemNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_04_006_CutPasteSystemNode.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_04_006_CutPasteSystemNode.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -47,8 +47,8 @@
<td>gtn</td>
</tr>
<tr>
- <td>clickAt</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -62,7 +62,7 @@
<td></td>
</tr>
<tr>
- <td>click</td>
+ <td>clickAndWait</td>
<td>link=Site</td>
<td></td>
</tr>
@@ -82,6 +82,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@title='Register']</td>
+ <td></td>
+</tr>
+<tr>
<td>mouseDownRight</td>
<td>//a[@title='Register']</td>
<td></td>
@@ -92,7 +97,7 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=Cut Node</td>
<td></td>
</tr>
@@ -142,11 +147,10 @@
<td></td>
</tr>
<tr>
- <td>click</td>
+ <td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_012_CompleteStep1InCreatePageAtTheSameLevelWithSameNodeNameButDifferentByLowerUpperCase.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_012_CompleteStep1InCreatePageAtTheSameLevelWithSameNodeNameButDifferentByLowerUpperCase.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_012_CompleteStep1InCreatePageAtTheSameLevelWithSameNodeNameButDifferentByLowerUpperCase.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -242,6 +242,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_por_19_012']</td>
+ <td></td>
+</tr>
+<tr>
<td>mouseDownRight</td>
<td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_por_19_012']</td>
<td></td>
@@ -316,7 +321,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_046_CreatePagesAtTheSameLevelWithSameNodeName.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_046_CreatePagesAtTheSameLevelWithSameNodeName.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_046_CreatePagesAtTheSameLevelWithSameNodeName.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -291,7 +291,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_047_CreateANewPageWithNodeNameIsTheSameWithExistingNodeNameAtTheSameLevel.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_047_CreateANewPageWithNodeNameIsTheSameWithExistingNodeNameAtTheSameLevel.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_19_047_CreateANewPageWithNodeNameIsTheSameWithExistingNodeNameAtTheSameLevel.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -321,7 +321,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -73,12 +73,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>xpath=//div[@id='UIPageBrowser']//a[text()='Add New Page']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>xpath=//div[@id='UIPageBrowser']//a[text()='Add New Page']</td>
<td></td>
</tr>
<tr>
@@ -98,7 +98,7 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//option[@value='portal']</td>
+ <td>name</td>
<td></td>
</tr>
<tr>
@@ -118,12 +118,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Page Layout']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Page Layout']</td>
<td></td>
</tr>
<tr>
@@ -133,12 +133,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Permission Setting']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Permission Setting']</td>
<td></td>
</tr>
<tr>
@@ -228,12 +228,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Portal Templates']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Portal Templates']</td>
<td></td>
</tr>
<tr>
@@ -243,12 +243,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Properties']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Properties']</td>
<td></td>
</tr>
<tr>
@@ -258,12 +258,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Permission Setting']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Permission Setting']</td>
<td></td>
</tr>
<tr>
@@ -332,11 +332,6 @@
<td></td>
</tr>
<tr>
- <td>waitForText</td>
- <td>//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td>
- <td>exact:*</td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>link=Save</td>
<td></td>
@@ -383,7 +378,7 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//a[text()='Page Management' and contains(@href, 'Test_POR_20_026')]</td>
+ <td>link=Page Management</td>
<td></td>
</tr>
<tr>
@@ -398,12 +393,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>xpath=//div[@id='UIPageBrowser']//a[text()='Add New Page']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>xpath=//div[@id='UIPageBrowser']//a[text()='Add New Page']</td>
<td></td>
</tr>
<tr>
@@ -423,7 +418,7 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//option[@value='portal']</td>
+ <td>name</td>
<td></td>
</tr>
<tr>
@@ -443,12 +438,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Page Layout']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Page Layout']</td>
<td></td>
</tr>
<tr>
@@ -458,12 +453,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Permission Setting']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']//div[text()='Permission Setting']</td>
<td></td>
</tr>
<tr>
@@ -528,12 +523,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>xpath=//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
@@ -602,17 +597,12 @@
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/private/classic/</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>link=Site</td>
<td></td>
</tr>
<tr>
- <td>click</td>
+ <td>clickAndWait</td>
<td>link=Site</td>
<td></td>
</tr>
@@ -651,17 +641,6 @@
<td>Test_POR_20_026</td>
<td></td>
</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Sign out</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAndWait</td>
- <td>link=Sign out</td>
- <td></td>
-</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_21_002_EditPageWhenUserHasRightToAccessButCanNotEditPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_21_002_EditPageWhenUserHasRightToAccessButCanNotEditPage.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_21_002_EditPageWhenUserHasRightToAccessButCanNotEditPage.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -57,6 +57,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=New Staff</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=New Staff</td>
<td></td>
@@ -103,12 +108,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIAccountPortlet']/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIAccountPortlet']//div[text()='User Profile']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIAccountPortlet']/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIAccountPortlet']//div[text()='User Profile']</td>
<td></td>
</tr>
<tr>
@@ -123,12 +128,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UIAccountForm']/div[3]/div[2]/table/tbody/tr/td/div[1]/div/div/div</td>
+ <td>link=Save</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UIAccountForm']/div[3]/div[2]/table/tbody/tr/td/div[1]/div/div/div</td>
+ <td>link=Save</td>
<td></td>
</tr>
<tr>
@@ -157,6 +162,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Users and groups management</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Users and groups management</td>
<td></td>
@@ -337,11 +347,6 @@
<td></td>
</tr>
<tr>
- <td>waitForText</td>
- <td>//div[@id='UIPermissionSelector']/div/div[2]/div/div[3]/div[2]</td>
- <td>manager</td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>link=Save</td>
<td></td>
@@ -368,6 +373,16 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>//form[@id='UIPageSearch']/div[2]/a</td>
<td></td>
</tr>
@@ -408,12 +423,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[text()='Permission Setting']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[text()='Permission Setting']</td>
<td></td>
</tr>
<tr>
@@ -497,11 +512,6 @@
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
<td>link=Sign in</td>
<td></td>
@@ -532,7 +542,7 @@
<td></td>
</tr>
<tr>
- <td>click</td>
+ <td>clickAndWait</td>
<td>link=Group</td>
<td></td>
</tr>
@@ -682,33 +692,38 @@
<td></td>
</tr>
<tr>
- <td>mouseOver</td>
- <td>link=Group Editor</td>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
<td></td>
</tr>
<tr>
- <td>mouseOver</td>
- <td>link=Edit Layout</td>
+ <td>click</td>
+ <td>link=Edit Navigation</td>
<td></td>
</tr>
<tr>
- <td>mouseOver</td>
- <td>link=Add New Page</td>
+ <td>waitForElementPresent</td>
+ <td>//div[contains(@onclick,'objectId=Test_POR_21_002')]</td>
<td></td>
</tr>
<tr>
- <td>verifyElementNotPresent</td>
- <td>link=Edit Page</td>
+ <td>verifyElementPresent</td>
+ <td>//div[contains(@onclick,'objectId=Test_POR_21_002')]</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
<td></td>
</tr>
<tr>
@@ -932,11 +947,15 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_22_022_CheckChangesAfterEditPagePropertiesWithFinish.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_22_022_CheckChangesAfterEditPagePropertiesWithFinish.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_22_022_CheckChangesAfterEditPagePropertiesWithFinish.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -52,6 +52,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Page Management</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Page Management</td>
<td></td>
@@ -298,21 +303,6 @@
</tr>
<tr>
<td>echo</td>
- <td>-- Permisison Setting --</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
<td>-- Edit Permission Setting --</td>
<td></td>
</tr>
@@ -466,7 +456,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -57,6 +57,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=New Staff</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=New Staff</td>
<td></td>
@@ -103,12 +108,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[text()='User Profile']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[text()='User Profile']</td>
<td></td>
</tr>
<tr>
@@ -157,28 +162,33 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Users and groups management</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Users and groups management</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td>
+ <td>//div[@id='UIOrganizationPortlet']//div[text()='Group Management']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td>
+ <td>//div[@id='UIOrganizationPortlet']//div[text()='Group Management']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td>
+ <td>//div[@id='UIOrganizationPortlet']//a[@title='Organization']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td>
+ <td>//div[@id='UIOrganizationPortlet']//a[@title='Organization']</td>
<td></td>
</tr>
<tr>
@@ -218,12 +228,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[1]/a</td>
+ <td>//a[@title='Up Level']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[1]/a</td>
+ <td>//a[@title='Up Level']</td>
<td></td>
</tr>
<tr>
@@ -267,13 +277,13 @@
<td></td>
</tr>
<tr>
- <td>clickAndWait</td>
+ <td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
+ <td>clickAndWait</td>
+ <td>link=Sign out</td>
<td></td>
</tr>
<tr>
@@ -303,7 +313,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -312,6 +322,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Group</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Group</td>
<td></td>
@@ -443,7 +458,7 @@
</tr>
<tr>
<td>assertConfirmation</td>
- <td>Are you sure you want to delete Test_POR_24_01_002 user?</td>
+ <td>Are you sure you want to delete Test_POR_24_01_003 user?</td>
<td></td>
</tr>
<tr>
@@ -456,7 +471,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_010_AddNewNodeWithNameIsTheSameWithExistingOneInTheSameLevelIn1Navigation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_010_AddNewNodeWithNameIsTheSameWithExistingOneInTheSameLevelIn1Navigation.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_010_AddNewNodeWithNameIsTheSameWithExistingOneInTheSameLevelIn1Navigation.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -412,11 +412,15 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -512,13 +512,13 @@
<td></td>
</tr>
<tr>
- <td>clickAndWait</td>
+ <td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
+ <td>clickAndWait</td>
+ <td>link=Sign out</td>
<td></td>
</tr>
<tr>
@@ -527,6 +527,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Sign in</td>
<td></td>
@@ -577,13 +582,18 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
<td></td>
</tr>
<tr>
@@ -687,7 +697,7 @@
<td></td>
</tr>
<tr>
- <td>click</td>
+ <td>clickAndWait</td>
<td>link=Group</td>
<td></td>
</tr>
@@ -787,11 +797,6 @@
<td>Test_POR_25_02_033</td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>searchOption</td>
- <td></td>
-</tr>
-<tr>
<td>select</td>
<td>searchOption</td>
<td>label=Title</td>
@@ -817,21 +822,16 @@
<td></td>
</tr>
<tr>
- <td>assertConfirmation</td>
+ <td>waitForConfirmation</td>
<td>Do you want to delete this page?</td>
<td></td>
</tr>
<tr>
- <td>waitForTextPresent</td>
- <td>No result found.</td>
+ <td>assertConfirmation</td>
+ <td>Do you want to delete this page?</td>
<td></td>
</tr>
<tr>
- <td>verifyTextPresent</td>
- <td>No result found.</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
<td></td>
@@ -851,7 +851,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_06_001_DeleteNodeWithDeletingConfirmation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_06_001_DeleteNodeWithDeletingConfirmation.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_06_001_DeleteNodeWithDeletingConfirmation.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -112,6 +112,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>css=div#UIGroupNavigationManagement div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>css=div#UIGroupNavigationManagement div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td>
<td></td>
@@ -221,7 +226,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_009_CheckFinishFunctionAfterChangeNodePageContainerLayout.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_009_CheckFinishFunctionAfterChangeNodePageContainerLayout.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_009_CheckFinishFunctionAfterChangeNodePageContainerLayout.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -43,15 +43,25 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=New Staff</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=New Staff</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Add New Page</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Add New Page</td>
<td></td>
@@ -109,7 +119,7 @@
<tr>
<td>waitForElementPresent</td>
<td>//div[@id='Gadgets/Calculator']/div/div/img</td>
- <td>//div[2]/div/div/div[1]/div/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div[1]/div</td>
+ <td></td>
</tr>
<tr>
<td>dragAndDropToObject</td>
@@ -122,16 +132,26 @@
<td>//div[2]/div/div/div/div/div/div/div[2]/div/div/div/div[1]/div</td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@onclick='eXo.core.DOMUtil.disableOnClick(this);']</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>//a[@onclick='eXo.core.DOMUtil.disableOnClick(this);']</td>
<td></td>
</tr>
<tr>
- <td>click</td>
+ <td>waitForElementPresent</td>
<td>link=Group</td>
<td></td>
</tr>
<tr>
+ <td>clickAndWait</td>
+ <td>link=Group</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Edit Navigation</td>
<td></td>
@@ -291,7 +311,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_01_002_CheckUpdatingUsersListAfterRegisterNewOne.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_01_002_CheckUpdatingUsersListAfterRegisterNewOne.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_01_002_CheckUpdatingUsersListAfterRegisterNewOne.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -57,6 +57,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=New Staff</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=New Staff</td>
<td></td>
@@ -152,6 +157,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
@@ -162,11 +172,6 @@
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>link=Sign in</td>
<td></td>
@@ -193,7 +198,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -212,11 +217,6 @@
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
- <td></td>
-</tr>
-<tr>
<td>echo</td>
<td>-- Check existing registered users list--</td>
<td></td>
@@ -248,7 +248,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -267,16 +267,6 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIListUsersGird']/table/tbody/tr[1]/td[1]/div</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyText</td>
- <td>//div[@id='UIListUsersGird']/table/tbody/tr[1]/td[1]/div</td>
- <td>Test_PRL_02_01_002</td>
-</tr>
-<tr>
<td>echo</td>
<td>-- Search new user in list --</td>
<td></td>
@@ -322,11 +312,15 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_03_003_EditLastNameOfUserInCommunityManagement.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_03_003_EditLastNameOfUserInCommunityManagement.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_02_03_003_EditLastNameOfUserInCommunityManagement.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
@@ -103,12 +103,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIAccountPortlet']/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIAccountPortlet']//div[text()='User Profile']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIAccountPortlet']/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIAccountPortlet']//div[text()='User Profile']</td>
<td></td>
</tr>
<tr>
@@ -168,12 +168,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
@@ -262,14 +262,14 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>waitForTextPresent</td>
+ <td>The user profile has been updated.</td>
<td></td>
</tr>
<tr>
- <td>verifyText</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>verifyTextPresent</td>
<td>The user profile has been updated.</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -288,12 +288,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
@@ -332,14 +332,14 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>waitForTextPresent</td>
+ <td>The user profile has been updated.</td>
<td></td>
</tr>
<tr>
- <td>verifyText</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>verifyTextPresent</td>
<td>The user profile has been updated.</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -368,12 +368,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
@@ -412,14 +412,14 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>waitForTextPresent</td>
+ <td>The user profile has been updated.</td>
<td></td>
</tr>
<tr>
- <td>verifyText</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>verifyTextPresent</td>
<td>The user profile has been updated.</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -438,12 +438,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
@@ -482,14 +482,14 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[2]/div[2]/div/div/div/div/div[2]</td>
+ <td>waitForTextPresent</td>
+ <td>The length of the text in field "Last Name:" must be between "1" and "45" characters.</td>
<td></td>
</tr>
<tr>
- <td>verifyText</td>
- <td>//div[2]/div[2]/div/div/div/div/div[2]</td>
+ <td>verifyTextPresent</td>
<td>The length of the text in field "Last Name:" must be between "1" and "45" characters.</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -527,14 +527,14 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>waitForTextPresent</td>
+ <td>The user profile has been updated.</td>
<td></td>
</tr>
<tr>
- <td>verifyText</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>verifyTextPresent</td>
<td>The user profile has been updated.</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -553,12 +553,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
@@ -597,14 +597,14 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>waitForTextPresent</td>
+ <td>The user profile has been updated.</td>
<td></td>
</tr>
<tr>
- <td>verifyText</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>verifyTextPresent</td>
<td>The user profile has been updated.</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -623,12 +623,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
@@ -667,14 +667,14 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>waitForTextPresent</td>
+ <td>The user profile has been updated.</td>
<td></td>
</tr>
<tr>
- <td>verifyText</td>
- <td>//div[3]/div/div/div/div/div[2]</td>
+ <td>verifyTextPresent</td>
<td>The user profile has been updated.</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -703,12 +703,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UISearchForm']/div[2]/a</td>
+ <td>//a[@title='Quick Search']</td>
<td></td>
</tr>
<tr>
@@ -731,7 +731,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_05_01_008_AddCategoryWithNameTheSameWithExistingButDifferentByUpperLowerCase.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_05_01_008_AddCategoryWithNameTheSameWithExistingButDifferentByUpperLowerCase.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_05_01_008_AddCategoryWithNameTheSameWithExistingButDifferentByUpperLowerCase.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -367,16 +367,6 @@
<td></td>
</tr>
<tr>
- <td>verifyTextPresent</td>
- <td>Todo</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForTextPresent</td>
- <td>Todo</td>
- <td></td>
-</tr>
-<tr>
<td>echo</td>
<td>-- Delete category is lower case--</td>
<td></td>
@@ -437,11 +427,15 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_05_06_004_LimitAccessRightInNonPublicCategoryGroupMembershipCategoryAreDifferent.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_05_06_004_LimitAccessRightInNonPublicCategoryGroupMembershipCategoryAreDifferent.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_05_06_004_LimitAccessRightInNonPublicCategoryGroupMembershipCategoryAreDifferent.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -222,6 +222,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
@@ -232,6 +237,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Sign in</td>
<td></td>
@@ -342,6 +352,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
@@ -352,11 +367,6 @@
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
<td>link=Sign in</td>
<td></td>
@@ -532,11 +542,6 @@
<td></td>
</tr>
<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
<td>link=Sign in</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_09_001_CheckSiteMapPortlet.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_09_001_CheckSiteMapPortlet.html 2011-06-07 15:21:41 UTC (rev 6609)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_09_001_CheckSiteMapPortlet.html 2011-06-08 07:17:56 UTC (rev 6610)
@@ -48,35 +48,49 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//div[@id='UIPortalLoginFormAction']//a[text()='Sign in']</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=SiteMap</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=SiteMap</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UISiteMap']//a[text()='Administration']</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
- <td>//div[@id='UISiteMap']/div[2]/div/div[3]/div[1]/a</td>
+ <td>//div[@id='UISiteMap']//a[text()='Administration']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UISiteMap']/div[2]/div/div[3]/div[2]/div[1]/div/div/a</td>
+ <td>//div[@id='UISiteMap']//a[text()='Application Registry']</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UISiteMap']/div[2]/div/div[3]/div[2]/div[1]/div/div/a</td>
+ <td>//div[@id='UISiteMap']//a[text()='Application Registry']</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
13 years, 6 months
- 1
- 0