3:58 a.m.
Author: hangnguyen
Date: 2010-06-14 04:58:54 -0400 (Mon, 14 Jun 2010)
New Revision: 3319
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_12_Portlet.html
Log:
TESTVN-356: Clean and improve
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-14
07:31:05 UTC (rev 3318)
+++
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_AddApplicationIntoCategory.html 2010-06-14
08:58:54 UTC (rev 3319)
@@ -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,21 +42,16 @@
<td>gtn</td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>clickAndWait</td>
<td>//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>echo</td>
<td>--Add Category</td>
<td></td>
@@ -64,12 +59,12 @@
<tr>
<td>waitForElementPresent</td>
<td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -102,7 +97,7 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=Add Permission</td>
<td></td>
</tr>
@@ -112,7 +107,7 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=Platform</td>
<td></td>
</tr>
@@ -122,7 +117,7 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=manager</td>
<td></td>
</tr>
@@ -132,7 +127,7 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=Save</td>
<td></td>
</tr>
@@ -152,7 +147,7 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=Test_cat_11</td>
<td></td>
</tr>
@@ -167,9 +162,9 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>//div[@class='ListContent']//div[@class='SelectedTab']//a[@class='ControlIcon
CreateNewIcon']</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>echo</td>
@@ -182,9 +177,9 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>//input[@name='application' and @value='1']</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>type</td>
@@ -192,7 +187,7 @@
<td>test_displayname_11</td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>css=form#UIAddApplicationForm div.UIAction div.ActionButton</td>
<td></td>
</tr>
@@ -202,24 +197,54 @@
<td></td>
</tr>
<tr>
+ <td>click</td>
+ <td>//a[@class='TabLabel' and @title='Administration']</td>
+ <td></td>
+</tr>
+<tr>
<td>echo</td>
<td>--Edit category permissions</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>//a[@class='TabLabel' and @title='Administration']</td>
- <td>1,1</td>
+ <td>waitForElementPresent</td>
+ <td>link=Test_cat_11</td>
+ <td></td>
</tr>
<tr>
+ <td>click</td>
+ <td>link=Test_cat_11</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
+ <td>//a[@onclick="javascript:ajaxGet('/portal/private/classic/administration/registry?portal:componentId=7f5a8dba-5a76-426f-8fdb-3d9db683b0ac&portal:type=action&uicomponent=UIApplicationOrganizer&op=EditCategory&objectId=Test_cat_11&ajaxRequest=true')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//a[@onclick="javascript:ajaxGet('/portal/private/classic/administration/registry?portal:componentId=7f5a8dba-5a76-426f-8fdb-3d9db683b0ac&portal:type=action&uicomponent=UIApplicationOrganizer&op=EditCategory&objectId=Test_cat_11&ajaxRequest=true')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[(a)onclick=&quot;eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this,
'UICategoryForm',
'categoryPermission');javascript:eXo.webui.UIForm.submitEvent('7f5a8dba-5a76-426f-8fdb-3d9db683b0ac#UICategoryForm','SelectTab','&objectId=categoryPermission')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[(a)onclick=&quot;eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this,
'UICategoryForm',
'categoryPermission');javascript:eXo.webui.UIForm.submitEvent('7f5a8dba-5a76-426f-8fdb-3d9db683b0ac#UICategoryForm','SelectTab','&objectId=categoryPermission')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>link=Add Permission</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=Add Permission</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -227,19 +252,19 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>//div[@id='ListPermissionSelector']//a[@title='Organization']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>link=manager</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=manager</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>waitForTextPresent</td>
@@ -252,9 +277,9 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=Test_cat_11</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>echo</td>
@@ -267,7 +292,7 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>//div[@class='ListContent']//div[@class='UIVTabContent']/div[1]//a[@class='ControlIcon
DeletePortalIcon']</td>
<td></td>
</tr>
@@ -292,12 +317,12 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>//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>
@@ -312,15 +337,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_12_Portlet.html
===================================================================
---
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html 2010-06-14
07:31:05 UTC (rev 3318)
+++
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html 2010-06-14
08:58:54 UTC (rev 3319)
@@ -87,23 +87,13 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[3]//a</td>
- <td></td>
+ <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>clickAt</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[3]//a</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForTextPresent</td>
- <td>AccountPortlet</td>
- <td></td>
-</tr>
-<tr>
<td>verifyTextPresent</td>
- <td>AccountPortlet</td>
+ <td>New Account</td>
<td></td>
</tr>
<tr>
@@ -113,12 +103,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[4]//a</td>
+ <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[3]//a</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[4]//a</td>
+ <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[3]//a</td>
<td></td>
</tr>
<tr>