[gatein-commits] gatein SVN: r3377 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Jun 18 03:34:27 EDT 2010


Author: vuthelinh
Date: 2010-06-18 03:34:26 -0400 (Fri, 18 Jun 2010)
New Revision: 3377

Modified:
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayingLanguage.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_SignInAndSignOut.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RememberMyLogin.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_UsersManagement.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_GroupsManagement.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_MembershipsManagement.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_ImportApplication.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_CreateAndEditAndDeleteCategoryInApplicationRegistry.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_AddApplicationIntoCategory.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ShowOrNotImportApplicationIcon.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_LinkToPages.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ExpandAll.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_CollapseAll.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ChangeLanguagePrivateMode.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_ChangeSkin.html
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPrivateMode.html
Log:
TESTVN-861: All GateIn Snifftest tests run on multiple browsers

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayingLanguage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayingLanguage.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayingLanguage.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -4,12 +4,12 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>SNF_PRL_03</title>
+<title>Test_SNF_PRL_03_ChangeDisplayingLanguage</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SNF_PRL_03</td></tr>
+<tr><td rowspan="1" colspan="3">Test_SNF_PRL_03_ChangeDisplayingLanguage</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -18,53 +18,68 @@
 </tr>
 <tr>
 	<td>echo</td>
-	<td>-Change Language-</td>
+	<td>-Change Language- English into Vietnamese</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//a[@class='Language']</td>
-	<td>1,1</td>
+	<td>waitForElementPresent</td>
+	<td>//a[3]</td>
+	<td></td>
 </tr>
 <tr>
+	<td>click</td>
+	<td>//a[3]</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
 	<td>link=Vietnamese</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Vietnamese</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>link=Apply</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
-	<td>link=Apply</td>
+	<td>verifyTextPresent</td>
+	<td>Đăng ký</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>xpath=//a[@class='Language']</td>
-	<td>1,1</td>
+	<td>verifyTextPresent</td>
+	<td>Đăng nhập</td>
+	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//a[@class='Language']</td>
-	<td>1,1</td>
+	<td>verifyTextPresent</td>
+	<td>Thay đổi ngôn ngữ</td>
+	<td></td>
 </tr>
 <tr>
+	<td>verifyTextPresent</td>
+	<td>Để biết thêm thông tin xin hãy liên lạc với chúng tôi.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=Thay đổi ngôn ngữ</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
-	<td>xpath=//div[@id='UITabContent']//div[2]/a</td>
+	<td>link=Tiếng Anh</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='UITabContent']//div[2]/a</td>
-	<td>1,1</td>
+	<td>click</td>
+	<td>link=Tiếng Anh</td>
+	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -72,10 +87,25 @@
 	<td></td>
 </tr>
 <tr>
+	<td>verifyTextPresent</td>
+	<td>Sign in</td>
+	<td></td>
+</tr>
+<tr>
 	<td>verifyElementPresent</td>
-	<td>link=Sign in</td>
+	<td>link=Register</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Change Language</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>For more information, please contact us.</td>
+	<td></td>
+</tr>
 
 </tbody></table>
 </body>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_SignInAndSignOut.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_SignInAndSignOut.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_SignInAndSignOut.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -4,12 +4,12 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="http://localhost:8080" />
-<title>SNF_PRL_04</title>
+<title>Test_SNF_PRL_04_SignInAndSignOut</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SNF_PRL_04</td></tr>
+<tr><td rowspan="1" colspan="3">Test_SNF_PRL_04_SignInAndSignOut</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -22,6 +22,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>verifyTextNotPresent</td>
+	<td>Root Root</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>link=Sign in</td>
 	<td></td>
@@ -42,28 +47,28 @@
 	<td>gtn</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>xpath=//div[@id='UIPortalLoginFormAction']//a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>link=Sign out</td>
+	<td>verifyTextPresent</td>
+	<td>Root Root</td>
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>link=Sign in</td>
+	<td>verifyTextNotPresent</td>
+	<td>Root Root</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyElementPresent</td>
-	<td>link=Sign in</td>
+	<td>verifyTextPresent</td>
+	<td>Sign in</td>
 	<td></td>
 </tr>
 

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RememberMyLogin.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RememberMyLogin.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RememberMyLogin.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -4,12 +4,12 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>SNF_PRL_05</title>
+<title>Test_SNF_PRL_05_RememberMyLogin</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SNF_PRL_05</td></tr>
+<tr><td rowspan="1" colspan="3">Test_SNF_PRL_05_RememberMyLogin</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -22,7 +22,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Sign in</td>
 	<td></td>
 </tr>
@@ -47,14 +47,14 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>rememberme</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>//div[@id='UIPortalLoginFormAction']//div[@class='ButtonMiddle']/a</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -68,10 +68,20 @@
 </tr>
 <tr>
 	<td>open</td>
-	<td>/</td>
+	<td>http://www.google.com</td>
 	<td></td>
 </tr>
 <tr>
+	<td>pause</td>
+	<td>3000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTitle</td>
+	<td>Google</td>
+	<td></td>
+</tr>
+<tr>
 	<td>echo</td>
 	<td>--Errase JSESSION Cookie to simulate leaving the browser</td>
 	<td></td>
@@ -97,15 +107,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAt</td>
-	<td>link=Sign out</td>
-	<td></td>
-</tr>
 
 </tbody></table>
 </body>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_UsersManagement.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_UsersManagement.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_UsersManagement.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -147,9 +147,9 @@
 	<td>test_name_nick_06</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Save</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_GroupsManagement.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_GroupsManagement.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_GroupsManagement.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -29,7 +29,7 @@
 <tr>
 	<td>waitForElementPresent</td>
 	<td>username</td>
-	<td>root</td>
+	<td></td>
 </tr>
 <tr>
 	<td>type</td>
@@ -52,47 +52,32 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Group</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Group</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>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td>
+	<td>echo</td>
+	<td>--Select &quot;Organization&quot; group from group tree</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>xpath=//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td>
+	<td>xpath=//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>echo</td>
-	<td>--Select &quot;Organization&quot; group from group tree</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td>
 	<td></td>
 </tr>
@@ -107,7 +92,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td>
 	<td></td>
 </tr>
@@ -118,15 +103,25 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='TitleBar']/a[@class='TreeActionIcon AddGroupIcon']</td>
+	<td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>xpath=//div[2]/div[1]/div[1]/a[3]</td>
 	<td></td>
 </tr>
 <tr>
+	<td>click</td>
+	<td>xpath=//div[2]/div[1]/div[1]/a[3]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForTextPresent</td>
+	<td>Group Name</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
 	<td>groupName</td>
 	<td></td>
@@ -152,17 +147,17 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//form[@id='UIGroupForm']//div[@class='ActionButton LightBlueStyle']</td>
+	<td>click</td>
+	<td>link=Save</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>test_group_label_07</td>
+	<td>waitForElementPresent</td>
+	<td>link=test_group_label_07</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=test_group_label_07</td>
 	<td></td>
 </tr>
@@ -171,34 +166,35 @@
 	<td>--Click &quot;Select User&quot; icon</td>
 	<td></td>
 </tr>
+<!----------------->
 <tr>
 	<td>waitForElementPresent</td>
-	<td>xpath=//form[@id='UIGroupMembershipForm']//div[@class='HorizontalLayout']//table[@class='UIFormGrid']//td[@class='FieldComponent']/a</td>
+	<td>xpath=//td[2]/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//td[2]/a</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>xpath=//form[@id='UIUserSelector']/div[2]/div[2]/table/tbody/tr/td/a[1]/div/div/div</td>
+	<td>//tr[2]/td[1]/div/input</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>john</td>
+	<td>check</td>
+	<td>//tr[3]/td[1]/div/input</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>mary</td>
+	<td>click</td>
+	<td>//tr[2]/td[1]/div/input</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>root</td>
+	<td>click</td>
+	<td>//tr[4]/td[1]/div/input</td>
 	<td></td>
 </tr>
 <tr>
@@ -212,23 +208,23 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>xpath=//input[@value='john,mary,root']</td>
-	<td></td>
+	<td>waitForValue</td>
+	<td>username</td>
+	<td>john,mary,root</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>link=Save</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>xpath=//div[@class='UIUserInGroup']//div[@title='john']</td>
+	<td>click</td>
+	<td>link=Save</td>
 	<td></td>
 </tr>
 <tr>
@@ -252,27 +248,33 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>link=test_group_label_07</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
+	<td>link=test_group_label_07</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
 	<td>xpath=//a[@class='TreeActionIcon RemoveGroupIcon']</td>
 	<td></td>
 </tr>
+<!------------------------->
 <tr>
-	<td>assertConfirmation</td>
-	<td>Are you sure you want to delete this group?</td>
+	<td>click</td>
+	<td>xpath=//a[@class='TreeActionIcon RemoveGroupIcon']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>link=Sign out</td>
+	<td>waitForConfirmation</td>
+	<td>Are you sure you want to delete this group?</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_MembershipsManagement.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_MembershipsManagement.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_MembershipsManagement.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -27,6 +27,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>username</td>
+	<td></td>
+</tr>
+<tr>
 	<td>type</td>
 	<td>username</td>
 	<td>root</td>
@@ -47,31 +52,21 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Users and groups management</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Users and groups management</td>
-	<td></td>
-</tr>
-<tr>
 	<td>echo</td>
 	<td>--Choose &quot;Memebership Management&quot; tab</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='MembershipButton']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='MembershipButton']</td>
-	<td></td>
-</tr>
-<tr>
 	<td>echo</td>
 	<td>--Create new membership</td>
 	<td></td>
@@ -92,7 +87,7 @@
 	<td>test_description_08</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Save</td>
 	<td></td>
 </tr>
@@ -112,9 +107,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//table[@class='UIGrid']//tbody/tr[2]/td[5]//img[@class='EditMembershipIcon']</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -129,50 +124,45 @@
 <tr>
 	<td>waitForElementPresent</td>
 	<td>link=Save</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Save</td>
-	<td>1,1</td>
-</tr>
-<tr>
-	<td>waitForTextPresent</td>
-	<td>test_description_edit_08</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>test_description_edit_08</td>
-	<td></td>
-</tr>
-<tr>
 	<td>echo</td>
 	<td>--Delete membership</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//table[@class='UIGrid']//tbody/tr[2]/td[5]//img[@class='DeleteMembershipIcon']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
+	<td>waitForConfirmation</td>
 	<td>Are you sure you want to delete this membership?</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
-	<td>link=classic</td>
+	<td>waitForTextNotPresent</td>
+	<td>test_name_08</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>link=Sign out</td>
+	<td>verifyTextNotPresent</td>
+	<td>test_name_08</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>verifyTextNotPresent</td>
+	<td>test_description_08</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_ImportApplication.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_ImportApplication.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_ImportApplication.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -17,14 +17,14 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>click</td>
 	<td>link=Sign in</td>
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
-	<td>link=Sign in</td>
-	<td></td>
+	<td>waitForElementPresent</td>
+	<td>username</td>
+	<td>root</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -37,7 +37,7 @@
 	<td>gtn</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
 	<td></td>
 </tr>
@@ -52,7 +52,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Application Registry</td>
 	<td></td>
 </tr>
@@ -67,7 +67,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIApplicationRegistryPortlet']/div[2]/div[2]/div/div/div[2]</td>
 	<td></td>
 </tr>
@@ -82,15 +82,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAt</td>
-	<td>link=Sign out</td>
-	<td></td>
-</tr>
 
 </tbody></table>
 </body>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_CreateAndEditAndDeleteCategoryInApplicationRegistry.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_CreateAndEditAndDeleteCategoryInApplicationRegistry.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_CreateAndEditAndDeleteCategoryInApplicationRegistry.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -27,6 +27,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>username</td>
+	<td></td>
+</tr>
+<tr>
 	<td>type</td>
 	<td>username</td>
 	<td>root</td>
@@ -52,9 +57,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Application Registry</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>echo</td>
@@ -64,12 +69,12 @@
 <tr>
 	<td>waitForElementPresent</td>
 	<td>xpath=//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -107,7 +112,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Add Permission</td>
 	<td></td>
 </tr>
@@ -117,7 +122,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Platform</td>
 	<td></td>
 </tr>
@@ -127,7 +132,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Administrators</td>
 	<td></td>
 </tr>
@@ -137,7 +142,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=manager</td>
 	<td></td>
 </tr>
@@ -147,7 +152,7 @@
 	<td>manager</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Save</td>
 	<td></td>
 </tr>
@@ -172,9 +177,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIApplicationOrganizer']//a[@class='ControlIcon EditIcon']</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -187,11 +192,16 @@
 	<td>test_displayname_edit_10</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>link=Save</td>
 	<td></td>
 </tr>
 <tr>
+	<td>click</td>
+	<td>link=Save</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForTextPresent</td>
 	<td>test_displayname_edit_10</td>
 	<td></td>
@@ -207,12 +217,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@class='SelectedTab']//a[@class='ControlIcon DeleteIcon']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
+	<td>waitForConfirmation</td>
 	<td>Are you sure to delete this category and all applications on it?</td>
 	<td></td>
 </tr>
@@ -227,15 +237,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>link=Sign out</td>
+	<td>clickAndWait</td>
+	<td>//div[3]/a</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAt</td>
-	<td>link=Sign out</td>
-	<td></td>
-</tr>
 
 </tbody></table>
 </body>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_AddApplicationIntoCategory.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_AddApplicationIntoCategory.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_AddApplicationIntoCategory.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -218,22 +218,22 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//a[@onclick=&quot;javascript:ajaxGet('/portal/private/classic/administration/registry?portal:componentId=7f5a8dba-5a76-426f-8fdb-3d9db683b0ac&amp;portal:type=action&amp;uicomponent=UIApplicationOrganizer&amp;op=EditCategory&amp;objectId=Test_cat_11&amp;ajaxRequest=true')&quot;]</td>
+	<td>//a[4]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//a[@onclick=&quot;javascript:ajaxGet('/portal/private/classic/administration/registry?portal:componentId=7f5a8dba-5a76-426f-8fdb-3d9db683b0ac&amp;portal:type=action&amp;uicomponent=UIApplicationOrganizer&amp;op=EditCategory&amp;objectId=Test_cat_11&amp;ajaxRequest=true')&quot;]</td>
+	<td>//a[4]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@onclick=&quot;eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UICategoryForm', 'categoryPermission');javascript:eXo.webui.UIForm.submitEvent('7f5a8dba-5a76-426f-8fdb-3d9db683b0ac#UICategoryForm','SelectTab','&amp;objectId=categoryPermission')&quot;]</td>
+	<td>//div[2]/div[2]/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@onclick=&quot;eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UICategoryForm', 'categoryPermission');javascript:eXo.webui.UIForm.submitEvent('7f5a8dba-5a76-426f-8fdb-3d9db683b0ac#UICategoryForm','SelectTab','&amp;objectId=categoryPermission')&quot;]</td>
+	<td>//div[2]/div[2]/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
@@ -277,6 +277,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>link=Test_cat_11</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>link=Test_cat_11</td>
 	<td></td>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -42,7 +42,7 @@
 	<td>gtn</td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>clickAndWait</td>
 	<td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
 	<td></td>
 </tr>
@@ -87,11 +87,6 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForText</td>
-	<td>//div[@id='UIApplicationOrganizer']/div[2]/div[1]/div/div/div[2]/div/div[1]/div[2]/div[2]/a[1]</td>
-	<td>New Account</td>
-</tr>
-<tr>
 	<td>verifyTextPresent</td>
 	<td>New Account</td>
 	<td></td>
@@ -113,12 +108,12 @@
 </tr>
 <tr>
 	<td>waitForTextPresent</td>
-	<td>OrganizationPortlet</td>
+	<td>Organization Management</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>OrganizationPortlet</td>
+	<td>Organization Management</td>
 	<td></td>
 </tr>
 <tr>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -22,14 +22,14 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Sign in</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>username</td>
-	<td>root</td>
+	<td></td>
 </tr>
 <tr>
 	<td>type</td>
@@ -42,7 +42,7 @@
 	<td>gtn</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
 	<td></td>
 </tr>
@@ -57,9 +57,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Application Registry</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -67,7 +67,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Gadget</td>
 	<td></td>
 </tr>
@@ -82,9 +82,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@class='IconControl AddNewIcon']</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -102,9 +102,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Add</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForTextPresent</td>
@@ -127,16 +127,21 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>//div[@class='SelectedItem ItemContent']/a[2]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
+	<td>waitForConfirmation</td>
 	<td>Are you sure to delete this gadget?</td>
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementNotPresent</td>
+	<td>//a[@title='Date &amp; Time']</td>
+	<td></td>
+</tr>
+<tr>
 	<td>verifyElementNotPresent</td>
 	<td>//a[@title='Date &amp; Time']</td>
 	<td></td>
@@ -152,11 +157,16 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>//div[@id='UIApplicationRegistryPortlet']/div[2]/div[2]/div/div/div[2]</td>
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>name</td>
+	<td></td>
+</tr>
+<tr>
 	<td>type</td>
 	<td>name</td>
 	<td>SNF_PRL_13</td>
@@ -167,7 +177,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Save</td>
 	<td></td>
 </tr>
@@ -182,25 +192,20 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>//div[@class='SelectedItem ItemContent']//a[2]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
+	<td>waitForConfirmation</td>
 	<td>Are you sure to delete this gadget?</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAt</td>
-	<td>link=Sign out</td>
-	<td></td>
-</tr>
 
 </tbody></table>
 </body>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ShowOrNotImportApplicationIcon.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ShowOrNotImportApplicationIcon.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ShowOrNotImportApplicationIcon.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -22,11 +22,16 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Sign in</td>
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>username</td>
+	<td></td>
+</tr>
+<tr>
 	<td>type</td>
 	<td>username</td>
 	<td>root</td>
@@ -37,21 +42,16 @@
 	<td>gtn</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Application Registry</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Application Registry</td>
-	<td>1,1</td>
-</tr>
-<tr>
 	<td>waitForElementPresent</td>
 	<td>xpath=//div[@class='IconControl ImportIcon']</td>
 	<td></td>
@@ -67,17 +67,22 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>link=Edit Page</td>
 	<td></td>
 </tr>
 <tr>
+	<td>click</td>
+	<td>link=Edit Page</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
 	<td>xpath=//a[@class='EditPortletPropertiesIcon']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//a[@class='EditPortletPropertiesIcon']</td>
 	<td></td>
 </tr>
@@ -97,17 +102,22 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<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=Close</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Close</td>
 	<td></td>
 </tr>
@@ -117,7 +127,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td>
 	<td></td>
 </tr>
@@ -147,17 +157,22 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>link=Edit Page</td>
 	<td></td>
 </tr>
 <tr>
+	<td>click</td>
+	<td>link=Edit Page</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
 	<td>xpath=//a[@class='EditPortletPropertiesIcon']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//a[@class='EditPortletPropertiesIcon']</td>
 	<td></td>
 </tr>
@@ -177,17 +192,22 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<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=Close</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Close</td>
 	<td></td>
 </tr>
@@ -197,7 +217,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td>
 	<td></td>
 </tr>
@@ -222,15 +242,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAt</td>
-	<td>link=Sign out</td>
-	<td></td>
-</tr>
 
 </tbody></table>
 </body>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_LinkToPages.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_LinkToPages.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_LinkToPages.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -4,12 +4,12 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>SNF_PRL_15</title>
+<title>Test_SNF_PRL_15_LinkToPages</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SNF_PRL_15</td></tr>
+<tr><td rowspan="1" colspan="3">Test_SNF_PRL_15_LinkToPages</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -17,6 +17,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>windowMaximize</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
 	<td>echo</td>
 	<td>-SiteMapAndLinkToPage-</td>
 	<td></td>
@@ -24,6 +29,11 @@
 <tr>
 	<td>clickAt</td>
 	<td>link=Sign in</td>
+	<td>1,1</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>username</td>
 	<td></td>
 </tr>
 <tr>
@@ -42,8 +52,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>open</td>
-	<td>/portal/private/classic/sitemap</td>
+	<td>clickAndWait</td>
+	<td>//div[@id='PortalNavigationTopContainer']/div[2]/div/div/div/div/div/div/a</td>
 	<td></td>
 </tr>
 <tr>
@@ -52,6 +62,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>css=div#UISiteMap div.ExpandIcon</td>
+	<td>1,1</td>
+</tr>
+<tr>
 	<td>clickAt</td>
 	<td>css=div#UISiteMap div.ExpandIcon</td>
 	<td>1,1</td>
@@ -62,23 +77,28 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>css=div#UISiteMap div.ChildrenContainer a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
-	<td>css=div#UISiteMap div.ChildrenContainer a</td>
+	<td>clickAndWait</td>
+	<td>//div[@id='UISiteMap']/div[2]/div/div[3]/div[2]/div[1]/div/div/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>link=Sign out</td>
+	<td>clickAndWait</td>
+	<td>//div[3]/a</td>
+	<td>1,1</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>1000</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Sign out</td>
+	<td>assertLocation</td>
+	<td>http://localhost:8080/portal/public/classic/</td>
 	<td></td>
 </tr>
 

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ExpandAll.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ExpandAll.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ExpandAll.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -4,12 +4,12 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>SNF_PRL_16</title>
+<title>Test_SNF_PRL_16_ExpandAll</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SNF_PRL_16</td></tr>
+<tr><td rowspan="1" colspan="3">Test_SNF_PRL_16_ExpandAll</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -24,6 +24,11 @@
 <tr>
 	<td>clickAt</td>
 	<td>link=Sign in</td>
+	<td>1,1</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>username</td>
 	<td></td>
 </tr>
 <tr>
@@ -52,6 +57,16 @@
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementNotPresent</td>
+	<td>//div[3]/div[2]/div[1]/div/div/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[3]/div[2]/div[1]/div/div/a</td>
+	<td></td>
+</tr>
+<tr>
 	<td>clickAt</td>
 	<td>xpath=//div[@id='UISiteMap']//div[@class='ClearFix']/div[2]</td>
 	<td>1,1</td>
@@ -72,12 +87,27 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyElementNotPresent</td>
-	<td>xpath=//div[@class='ExpandIcon FloatLeft']</td>
+	<td>verifyTextPresent</td>
+	<td>Users and groups management</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>verifyTextPresent</td>
+	<td>Google</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Facebook</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Page Management</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_CollapseAll.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_CollapseAll.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_CollapseAll.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -4,12 +4,12 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>SNF_PRL_17</title>
+<title>Test_SNF_PRL_17_CollapseAll</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SNF_PRL_17</td></tr>
+<tr><td rowspan="1" colspan="3">Test_SNF_PRL_17_CollapseAll</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -27,6 +27,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>username</td>
+	<td></td>
+</tr>
+<tr>
 	<td>type</td>
 	<td>username</td>
 	<td>root</td>
@@ -42,8 +47,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>open</td>
-	<td>/portal/private/classic/sitemap</td>
+	<td>clickAndWait</td>
+	<td>link=SiteMap</td>
 	<td></td>
 </tr>
 <tr>
@@ -58,41 +63,126 @@
 </tr>
 <tr>
 	<td>waitForTextPresent</td>
-	<td>Blog</td>
+	<td>Page Management</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
+	<td>Page Management</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
 	<td>New Staff</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Application Registry</td>
+	<td>Users and groups management</td>
 	<td></td>
 </tr>
 <tr>
+	<td>verifyTextPresent</td>
+	<td>Blog</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Google</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Facebook</td>
+	<td></td>
+</tr>
+<tr>
 	<td>echo</td>
 	<td>--Collapse SiteMap Tree</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='UISiteMap']//div[@class='ClearFix']/div[1]</td>
-	<td>1,1</td>
+	<td>waitForElementPresent</td>
+	<td>//div[@id='UISiteMap']/div[1]/div[1]</td>
+	<td></td>
 </tr>
 <tr>
-	<td>waitForTextNotPresent</td>
-	<td>Blog</td>
+	<td>click</td>
+	<td>//div[@id='UISiteMap']/div[1]/div[1]</td>
 	<td></td>
 </tr>
 <tr>
+	<td>echo</td>
+	<td>-- verify Application Registry disappear</td>
+	<td></td>
+</tr>
+<tr>
 	<td>verifyElementNotPresent</td>
-	<td>xpath=//div[@class='CollapseIcon FloatLeft']</td>
+	<td>//div[@id='UISiteMap']/div[2]/div/div[3]/div[2]/div[1]/div/div/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>echo</td>
+	<td>-- verify&nbsp;&nbsp;Page Management disappear</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[3]/div[2]/div[2]/div/div/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>echo</td>
+	<td>-- verify&nbsp;&nbsp;New Staff disappear</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[4]/div[2]/div[1]/div/div/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>echo</td>
+	<td>-- verify Users and groups management&nbsp;&nbsp;disappear</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[4]/div[2]/div[2]/div/div/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>echo</td>
+	<td>-- verify&nbsp;&nbsp;Blog disappear</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[5]/div[2]/div[1]/div/div/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>echo</td>
+	<td>-- verify&nbsp;&nbsp;Google disappear</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[5]/div[2]/div[2]/div/div/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>echo</td>
+	<td>-- verify Facebook disappear</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[3]/div/div/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
+<link rel="selenium.base" href="http://localhost:8080" />
 <title>Test_SNF_PRL_18_CreateNewPortal</title>
 </head>
 <body>
@@ -48,7 +48,7 @@
 </tr>
 <tr>
 	<td>open</td>
-	<td>/portal/private/classic/portalnavigation</td>
+	<td>/portal/public/classic/portalnavigation</td>
 	<td></td>
 </tr>
 <tr>
@@ -82,76 +82,115 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>//div[contains(@onclick, 'eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane') and contains(@onclick, 'PermissionSetting')]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAt</td>
-	<td>publicMode</td>
+	<td>//div[contains(@onclick, 'eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane') and contains(@onclick, 'PermissionSetting')]</td>
 	<td></td>
 </tr>
+<!--//------------->
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
+	<td>link=Add Permission</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>link=Customers</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=Customers</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>link=exact:*</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=exact:*</td>
+	<td></td>
+</tr>
+<!-------------//-->
+<tr>
+	<td>waitForElementPresent</td>
 	<td>link=Edit Permission Setting</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
+	<td>link=Edit Permission Setting</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
 	<td>link=Select Permission</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAt</td>
-	<td>link=Platform</td>
-	<td>1,1</td>
+	<td>link=Select Permission</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>xpath=//div[@id='PermissionSelector']//a[@title='Administrators']</td>
+	<td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='PermissionSelector']//a[@title='Administrators']</td>
-	<td>1,1</td>
+	<td>click</td>
+	<td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div/a</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>xpath=//div[@id='PermissionSelector']//a[@title='manager']</td>
+	<td>link=Administrators</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='PermissionSelector']//a[@title='manager']</td>
+	<td>click</td>
+	<td>link=Administrators</td>
 	<td></td>
 </tr>
+<!---------------------->
 <tr>
-	<td>waitForTextNotPresent</td>
-	<td>Permission Selector</td>
+	<td>waitForElementPresent</td>
+	<td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']//div[@class='ButtonMiddle']/a</td>
-	<td>1,1</td>
+	<td>click</td>
+	<td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td>
+	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>test_portal_18</td>
+	<td>waitForElementPresent</td>
+	<td>link=Save</td>
 	<td></td>
 </tr>
 <tr>
-	<td>pause</td>
-	<td>10000</td>
+	<td>click</td>
+	<td>link=Save</td>
 	<td></td>
 </tr>
+<!-------->
 <tr>
 	<td>echo</td>
 	<td>--Verify portal creation</td>
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>link=test_portal_18</td>
+	<td></td>
+</tr>
+<tr>
 	<td>verifyElementPresent</td>
 	<td>link=test_portal_18</td>
 	<td></td>
@@ -171,43 +210,35 @@
 	<td>link=Site</td>
 	<td></td>
 </tr>
+<!-------->
 <tr>
-	<td>pause</td>
-	<td>10000</td>
-	<td></td>
-</tr>
-<tr>
 	<td>waitForElementPresent</td>
 	<td>xpath=//div[@id='UISiteManagement']/table/tbody/tr/td[2]/div</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td>
+	<td>clickAndWait</td>
+	<td>link=Delete</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
+	<td>waitForConfirmation</td>
 	<td>Are you sure you want to delete this portal?</td>
 	<td></td>
 </tr>
+<!-------->
 <tr>
-	<td>pause</td>
-	<td>5000</td>
-	<td></td>
-</tr>
-<tr>
 	<td>waitForTextNotPresent</td>
 	<td>test_portal_18</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>link=Sign out</td>
+	<td>verifyTextNotPresent</td>
+	<td>test_portal_18</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -22,14 +22,14 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Sign in</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>username</td>
-	<td>root</td>
+	<td></td>
 </tr>
 <tr>
 	<td>type</td>
@@ -42,7 +42,7 @@
 	<td>gtn</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
 	<td></td>
 </tr>
@@ -52,7 +52,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Site</td>
 	<td></td>
 </tr>
@@ -67,7 +67,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//a[@class='EditLayoutIcon']</td>
 	<td></td>
 </tr>
@@ -77,7 +77,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//a[@title='Administration']</td>
 	<td></td>
 </tr>
@@ -97,13 +97,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIPortalComposer']//div[@class='OverflowContainer']/a[@class='CloseButton']</td>
-	<td>1,1</td>
-</tr>
-<tr>
-	<td>waitForTextPresent</td>
-	<td>classic</td>
 	<td></td>
 </tr>
 <tr>
@@ -112,19 +107,24 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>link=Edit Navigation</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
+	<td>click</td>
+	<td>link=Edit Navigation</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
 	<td>link=Add Node</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Add Node</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -147,17 +147,22 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>css=div#UISiteManagement &gt; div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
+	<td>click</td>
+	<td>css=div#UISiteManagement &gt; div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
 	<td>link=Search and Select Page</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Search and Select Page</td>
 	<td></td>
 </tr>
@@ -172,7 +177,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIRepeater']//table//tbody/tr/td[5]/div[@class='ActionContainer']/img</td>
 	<td></td>
 </tr>
@@ -187,9 +192,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Save</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -202,7 +207,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Save</td>
 	<td></td>
 </tr>
@@ -214,12 +219,12 @@
 <tr>
 	<td>waitForElementPresent</td>
 	<td>link=Edit Portal's Config</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Edit Portal's Config</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -227,7 +232,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td>
 	<td></td>
 </tr>
@@ -237,7 +242,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Edit Permission Setting</td>
 	<td></td>
 </tr>
@@ -247,7 +252,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Select Permission</td>
 	<td></td>
 </tr>
@@ -257,7 +262,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Platform</td>
 	<td></td>
 </tr>
@@ -267,26 +272,37 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Administrators</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='PermissionSelector']//div[2]/a</td>
+	<td>waitForElementPresent</td>
+	<td>link=manager</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextNotPresent</td>
-	<td>Permission Selector</td>
+	<td>click</td>
+	<td>link=manager</td>
 	<td></td>
 </tr>
+<!--click Save-->
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']</td>
+	<td>waitForElementPresent</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>//form[@id='UIPortalForm']/div[3]/div[2]/table/tbody/tr/td/div[1]/div/div/div/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=test_node_label_19</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForTextNotPresent</td>
 	<td>Portal Setting</td>
 	<td></td>
@@ -302,31 +318,21 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>link=test_node_label_19</td>
+	<td>clickAndWait</td>
+	<td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=test_node_label_19</td>
-	<td></td>
-</tr>
-<tr>
 	<td>echo</td>
 	<td>--Delete node</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Site</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Site</td>
-	<td></td>
-</tr>
-<tr>
 	<td>waitForElementPresent</td>
 	<td>link=Edit Navigation</td>
 	<td></td>
@@ -337,22 +343,22 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>xpath=//div[@id='UINavigationManagement']</td>
+	<td>componentExoContextMenu</td>
+	<td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[8]/div/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>componentExoContextMenu</td>
-	<td>xpath=//a[@title='test_node_label_19']</td>
+	<td>echo</td>
+	<td>test bug</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
+	<td>click</td>
+	<td>link=Delete Node</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
+	<td>waitForConfirmation</td>
 	<td>Are you sure you want to delete this node?</td>
 	<td></td>
 </tr>
@@ -362,50 +368,30 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Save</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
-	<td>link=test_node_label_19</td>
-	<td></td>
-</tr>
-<tr>
 	<td>echo</td>
 	<td>--Verify Deletion</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Home</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Home</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForTextPresent</td>
-	<td>Demo</td>
-	<td></td>
-</tr>
-<tr>
 	<td>verifyTextNotPresent</td>
 	<td>test_node_label_19</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAt</td>
-	<td>link=Sign out</td>
-	<td></td>
-</tr>
 
 </tbody></table>
 </body>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -22,7 +22,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Sign in</td>
 	<td></td>
 </tr>
@@ -47,7 +47,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>link=Site</td>
 	<td></td>
 </tr>
@@ -106,18 +106,40 @@
 	<td>xpath=//div[@onclick=&quot;eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&amp;objectId=PermissionSetting')&quot;]</td>
 	<td></td>
 </tr>
+<!--//----------------------->
 <tr>
 	<td>waitForElementPresent</td>
-	<td>publicMode</td>
+	<td>link=Add Permission</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>publicMode</td>
+	<td>click</td>
+	<td>link=Add Permission</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
+	<td>link=Customers</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=Customers</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>link=exact:*</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=exact:*</td>
+	<td></td>
+</tr>
+<!----------------------//-->
+<tr>
+	<td>waitForElementPresent</td>
 	<td>link=Edit Permission Setting</td>
 	<td></td>
 </tr>
@@ -136,34 +158,40 @@
 	<td>link=Select Permission</td>
 	<td></td>
 </tr>
+<!--------------------->
 <tr>
 	<td>waitForElementPresent</td>
-	<td>link=Platform</td>
+	<td>//div[@onclick=&quot;javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&amp;subComponentId=TreePermissionSelector&amp;objectId=/platform')&quot;]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Platform</td>
+	<td>click</td>
+	<td>//div[@onclick=&quot;javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&amp;subComponentId=TreePermissionSelector&amp;objectId=/platform')&quot;]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Platform</td>
+	<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></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></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
-	<td>link=exact:*</td>
+	<td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=exact:*</td>
+	<td>click</td>
+	<td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForText</td>
-	<td>xpath=//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td>
+	<td>waitForElementPresent</td>
+	<td>link=Save</td>
 	<td>exact:*</td>
 </tr>
 <tr>
@@ -192,22 +220,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
+	<td>clickAndWait</td>
+	<td>link=Delete</td>
 	<td></td>
 </tr>
 <tr>
-	<td>pause</td>
-	<td>5000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertConfirmation</td>
+	<td>waitForConfirmation</td>
 	<td>Are you sure you want to delete this portal?</td>
 	<td></td>
 </tr>
@@ -222,15 +240,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAt</td>
-	<td>link=Sign out</td>
-	<td></td>
-</tr>
 
 </tbody></table>
 </body>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -22,7 +22,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Sign in</td>
 	<td></td>
 </tr>
@@ -47,7 +47,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>link=Site</td>
 	<td></td>
 </tr>
@@ -62,7 +62,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Add New Portal</td>
 	<td></td>
 </tr>
@@ -77,12 +77,17 @@
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>name</td>
+	<td></td>
+</tr>
+<tr>
 	<td>type</td>
 	<td>name</td>
 	<td>test_portal_name_21</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>//div[@onclick=&quot;eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&amp;objectId=Properties')&quot;]</td>
 	<td></td>
 </tr>
@@ -91,144 +96,151 @@
 	<td>//div[@onclick=&quot;eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&amp;objectId=PermissionSetting')&quot;]</td>
 	<td></td>
 </tr>
+<!--//------------------------->
 <tr>
-	<td>clickAt</td>
-	<td>publicMode</td>
+	<td>waitForElementPresent</td>
+	<td>link=Add Permission</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Edit Permission Setting</td>
+	<td>click</td>
+	<td>link=Add Permission</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Select Permission</td>
+	<td>waitForElementPresent</td>
+	<td>//a[contains(text(),'Platform')]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Platform</td>
+	<td>click</td>
+	<td>//a[contains(text(),'Platform')]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Platform</td>
+	<td>waitForElementPresent</td>
+	<td>link=Administrators</td>
 	<td></td>
 </tr>
 <tr>
+	<td>click</td>
+	<td>link=Administrators</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
 	<td>link=exact:*</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=exact:*</td>
 	<td></td>
 </tr>
+<!----------------//-->
 <tr>
-	<td>waitForText</td>
-	<td>//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td>
-	<td>exact:*</td>
+	<td>waitForElementPresent</td>
+	<td>link=Edit Permission Setting</td>
+	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Save</td>
+	<td>click</td>
+	<td>link=Edit Permission Setting</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>test_portal_name_21</td>
+	<td>waitForElementPresent</td>
+	<td>link=Select Permission</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
+	<td>click</td>
+	<td>link=Select Permission</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>test_portal_name_21</td>
+	<td>waitForElementPresent</td>
+	<td>//div[@onclick=&quot;javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&amp;subComponentId=TreePermissionSelector&amp;objectId=/platform')&quot;]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>echo</td>
-	<td>--View new portal</td>
+	<td>click</td>
+	<td>//div[@onclick=&quot;javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&amp;subComponentId=TreePermissionSelector&amp;objectId=/platform')&quot;]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
-	<td>link=Site</td>
+	<td>waitForElementPresent</td>
+	<td>//div[@onclick=&quot;javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&amp;subComponentId=TreePermissionSelector&amp;objectId=/platform/administrators')&quot;]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
-	<td>link=test_portal_name_21</td>
+	<td>click</td>
+	<td>//div[@onclick=&quot;javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&amp;subComponentId=TreePermissionSelector&amp;objectId=/platform/administrators')&quot;]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>link=Site</td>
+	<td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>open</td>
-	<td>/portal/private/classic/</td>
+	<td>click</td>
+	<td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>link=Site</td>
+	<td>link=Save</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAt</td>
-	<td>link=Site</td>
+	<td>link=Save</td>
 	<td></td>
 </tr>
 <tr>
-	<td>echo</td>
-	<td>--Delete new portal</td>
+	<td>waitForElementPresent</td>
+	<td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='UISiteManagement']/table[2]//td[3]/a[4]</td>
+	<td>verifyTextPresent</td>
+	<td>test_portal_name_21</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>//div[@id='UISiteManagement']/table[2]//td[3]/a[4]</td>
+	<td>echo</td>
+	<td>--View new portal</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
-	<td>Are you sure you want to delete this portal?</td>
+	<td>clickAndWait</td>
+	<td>link=test_portal_name_21</td>
 	<td></td>
 </tr>
 <tr>
-	<td>pause</td>
-	<td>5000</td>
+	<td>echo</td>
+	<td>--Delete new portal</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextNotPresent</td>
-	<td>test_portal_name_21</td>
+	<td>clickAndWait</td>
+	<td>link=Site</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextNotPresent</td>
-	<td>test_portal_name_21</td>
+	<td>clickAndWait</td>
+	<td>link=Delete</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>link=Sign out</td>
+	<td>waitForConfirmation</td>
+	<td>Are you sure you want to delete this portal?</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Sign out</td>
+	<td>verifyTextNotPresent</td>
+	<td>test_portal_name_21</td>
 	<td></td>
 </tr>
 

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/portal" />
+<link rel="selenium.base" href="http://localhost:8080" />
 <title>Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal</title>
 </head>
 <body>
@@ -52,11 +52,16 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>waitForElementPresent</td>
 	<td>link=Edit Layout</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
+	<td>click</td>
+	<td>link=Edit Layout</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
 	<td>link=Site's Config</td>
 	<td></td>
@@ -132,24 +137,24 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForText</td>
-	<td>xpath=//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td>
-	<td>exact:*</td>
+	<td>waitForElementPresent</td>
+	<td>link=Save</td>
+	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Save</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>xpath=//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td>
+	<td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td>
-	<td>1,1</td>
+	<td>click</td>
+	<td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -167,19 +172,19 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Site</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Site</td>
+	<td>waitForElementPresent</td>
+	<td>link=Edit Layout</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Edit Layout</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -197,39 +202,54 @@
 	<td></td>
 </tr>
 <tr>
+	<td>select</td>
+	<td>locale</td>
+	<td>label=English</td>
+</tr>
+<tr>
 	<td>verifyTextPresent</td>
 	<td>French</td>
 	<td></td>
 </tr>
 <tr>
-	<td>select</td>
-	<td>locale</td>
-	<td>label=English</td>
+	<td>waitForElementPresent</td>
+	<td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td>
+	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>publicMode</td>
+	<td>link=Save</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td>
-	<td>1,1</td>
+	<td>click</td>
+	<td>link=Save</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
+	<td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
 	<td>link=classic</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=classic</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
@@ -237,9 +257,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
-	<td>1,1</td>
+	<td></td>
 </tr>
 
 </tbody></table>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -42,7 +42,7 @@
 	<td>gtn</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
 	<td></td>
 </tr>
@@ -52,16 +52,11 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Group</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Group</td>
-	<td></td>
-</tr>
-<tr>
 	<td>waitForElementPresent</td>
 	<td>link=Add Navigation</td>
 	<td></td>
@@ -87,7 +82,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Cancel</td>
 	<td></td>
 </tr>
@@ -97,7 +92,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td>
 	<td></td>
 </tr>
@@ -117,7 +112,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForText</td>
+	<td>waitForElementPresent</td>
+	<td>//div[contains(@id,'UIPopupWindow')]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
 	<td>name</td>
 	<td></td>
 </tr>
@@ -247,17 +247,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
-	<td>link=test_grp_label_23</td>
-	<td></td>
-</tr>
-<tr>
 	<td>waitForElementPresent</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ChangeLanguagePrivateMode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ChangeLanguagePrivateMode.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ChangeLanguagePrivateMode.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -4,12 +4,12 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>SNF_PRL_31</title>
+<title>Test_SNF_PRL_31_ChangeLanguagePrivateMode</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SNF_PRL_31</td></tr>
+<tr><td rowspan="1" colspan="3">Test_SNF_PRL_31_ChangeLanguagePrivateMode</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -27,6 +27,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>username</td>
+	<td></td>
+</tr>
+<tr>
 	<td>type</td>
 	<td>username</td>
 	<td>root</td>
@@ -112,10 +117,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<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>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_ChangeSkin.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_ChangeSkin.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_ChangeSkin.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -22,16 +22,11 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>click</td>
 	<td>link=Sign in</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>link=Sign in</td>
-	<td></td>
-</tr>
-<tr>
 	<td>waitForElementPresent</td>
 	<td>username</td>
 	<td></td>
@@ -47,7 +42,7 @@
 	<td>gtn</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
 	<td></td>
 </tr>
@@ -57,7 +52,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Change Skin</td>
 	<td></td>
 </tr>
@@ -68,17 +63,17 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>xpath=//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='SelectedItem Item']</td>
+	<td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>xpath=//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='SelectedItem Item']</td>
+	<td>click</td>
+	<td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>//div[@id='UIMaskWorkspace']//div[@class='UIChangeSkinForm']//div[@class='UIAction']//div</td>
+	<td>clickAndWait</td>
+	<td>link=Apply</td>
 	<td></td>
 </tr>
 <tr>
@@ -88,11 +83,6 @@
 </tr>
 <tr>
 	<td>echo</td>
-	<td>---------</td>
-	<td></td>
-</tr>
-<tr>
-	<td>echo</td>
 	<td>--Change to Simple skin--</td>
 	<td></td>
 </tr>
@@ -113,22 +103,22 @@
 </tr>
 <tr>
 	<td>verifyText</td>
-	<td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']/div[@class='SelectedItem Item']</td>
+	<td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td>
 	<td>Default Style Skin</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']/div[2]</td>
+	<td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[2]/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']/div[2]</td>
+	<td>click</td>
+	<td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[2]/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>//div[@id='UIMaskWorkspace']//div[@class='UIChangeSkinForm']//div[@class='UIAction']//div</td>
+	<td>clickAndWait</td>
+	<td>link=Apply</td>
 	<td></td>
 </tr>
 <tr>
@@ -153,39 +143,34 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='Item']</td>
+	<td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td>
 	<td>Default Style Skin</td>
 </tr>
 <tr>
 	<td>verifyText</td>
-	<td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='Item']</td>
+	<td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td>
 	<td>Default Style Skin</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']/div/div</td>
+	<td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[2]/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']/div/div</td>
+	<td>click</td>
+	<td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[2]/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>//div[@id='UIMaskWorkspace']//div[@class='UIChangeSkinForm']//div[@class='UIAction']//div</td>
+	<td>clickAndWait</td>
+	<td>link=Apply</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAt</td>
-	<td>link=Sign out</td>
-	<td></td>
-</tr>
 
 </tbody></table>
 </body>

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPrivateMode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPrivateMode.html	2010-06-17 23:14:00 UTC (rev 3376)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPrivateMode.html	2010-06-18 07:34:26 UTC (rev 3377)
@@ -17,16 +17,26 @@
 	<td></td>
 </tr>
 <tr>
+	<td>windowMaximize</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
 	<td>echo</td>
 	<td>-CreateNewAccountInPrivateMode-</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Sign in</td>
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>username</td>
+	<td>root</td>
+</tr>
+<tr>
 	<td>type</td>
 	<td>username</td>
 	<td>root</td>
@@ -37,12 +47,12 @@
 	<td>gtn</td>
 </tr>
 <tr>
-	<td>clickAtAndWait</td>
+	<td>clickAndWait</td>
 	<td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>link=New Staff</td>
 	<td></td>
 </tr>
@@ -87,7 +97,7 @@
 	<td>test_user_35 at yahoo.com</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@class='UIRowContainer']//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div[2]/div/div/div/div</td>
 	<td></td>
 </tr>
@@ -102,12 +112,12 @@
 	<td>test_name_given_35</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@class='UIRowContainer']//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div/div/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Save</td>
 	<td></td>
 </tr>
@@ -127,7 +137,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>link=Users and groups management</td>
 	<td></td>
 </tr>
@@ -152,12 +162,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>click</td>
 	<td>xpath=//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
+	<td>waitForConfirmation</td>
 	<td>Are you sure you want to delete test_user_35 user?</td>
 	<td></td>
 </tr>
@@ -167,12 +177,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>link=Sign out</td>
+	<td>verifyTextNotPresent</td>
+	<td>test_user_35</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAndWait</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>



More information about the gatein-commits mailing list