[Erp5-report] r44481 gabriel - in /erp5/trunk/bt5/erp5_web_ung_ui_test: PathTemplateItem/po...

[nobody at svn.erp5.org]

Author: gabriel
Date: Mon Mar 21 20:20:58 2011
New Revision: 44481

URL: http://svn.erp5.org?rev=44481&view=rev
Log:
- improve zelenium asserts
- add code in script to clean up the module before each test

Modified:
    erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml
    erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGCalendar.xml
    erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/ERP5Site_cleanUpUNGTestEnvironment.xml
    erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml?rev=44481&r1=44480&r2=44481&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml [utf8] Mon Mar 21 20:20:58 2011
@@ -119,6 +119,16 @@
         <td>//a[@class="clickable-block block-remove"]</td>\n
         <td></td>\n
       </tr>\n
+      <tr>\n
+        <td>click</td>\n
+        <td>//a[@class="clickable-block block-remove"]</td>\n
+        <td></td>\n
+      </tr>\n
+      <tr>\n
+        <td>assertConfirmation</td>\n
+        <td>Are you sure you want to remove this gadget from your personalized page?</td>\n
+        <td></td>\n
+      </tr>\n
     </tbody>\n
   </table>\n
 </body>\n

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGCalendar.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGCalendar.xml?rev=44481&r1=44480&r2=44481&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGCalendar.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGCalendar.xml [utf8] Mon Mar 21 20:20:58 2011
@@ -90,16 +90,16 @@
         <td></td>\n
       </tr>\n
       <tr>\n
-        <td>verifyTextPresent</td>\n
-        <td>No Results</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
         <td>verifyText</td>\n
         <td>//td[@id="resultview"]</td>\n
         <td>Results: 0 to UNG Event</td>\n
       </tr>\n
       <tr>\n
+        <td>verifyTextPresent</td>\n
+        <td>No Results</td>\n
+        <td></td>\n
+      </tr>\n
+      <tr>\n
         <td>clickAndWait</td>\n
         <td>//a[@id="back-calendar"]</td>\n
         <td></td>\n
@@ -110,6 +110,11 @@
         <td></td>\n
       </tr>\n
       <tr>\n
+        <td>waitForCondition</td>\n
+        <td>selenium.isElementPresent("portal_type")</td>\n
+        <td>10000</td>\n
+      </tr>\n
+      <tr>\n
         <td>select</td>\n
         <td>//select[@name="portal_type"]</td>\n
         <td>Note</td>\n

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/ERP5Site_cleanUpUNGTestEnvironment.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/ERP5Site_cleanUpUNGTestEnvironment.xml?rev=44481&r1=44480&r2=44481&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/ERP5Site_cleanUpUNGTestEnvironment.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/ERP5Site_cleanUpUNGTestEnvironment.xml [utf8] Mon Mar 21 20:20:58 2011
@@ -53,6 +53,14 @@
             <value> <string>portal = context.getPortalObject()\n
 ung_website = portal.web_site_module.ung\n
 \n
+def cleanUpModule(module):\n
+  object_list = module.searchFolder()\n
+\n
+  for object in object_list:\n
+    real_object = context.restrictedTraverse(object.getPath())\n
+    module.deleteContent(real_object.getId())\n
+\n
+\n
 pad_list = portal.portal_catalog(portal_type="Knowledge Pad",\n
                                  publication_section_uid=ung_website.getUid())\n
 \n
@@ -67,6 +75,9 @@ for person in person_list:\n
   person_object = context.restrictedTraverse(person.getPath())\n
   portal.person_module.deleteContent(person_object.getId())\n
 \n
+cleanUpModule(portal.web_page_module)\n
+cleanUpModule(portal.event_module)\n
+\n
 return True\n
 </string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision?rev=44481&r1=44480&r2=44481&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision [utf8] Mon Mar 21 20:20:58 2011
@@ -1 +1 @@
-33
\ No newline at end of file
+34
\ No newline at end of file