[Erp5-report] r45613 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: TestTemplateItem/ bt/

[nobody at svn.erp5.org]

Author: gabriel
Date: Thu Apr 21 17:19:21 2011
New Revision: 45613

URL: http://svn.erp5.org?rev=45613&view=rev
Log:
- refactor test
- use id instead of uid to validate if the objects were deleted correctly

Modified:
    erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
    erp5/trunk/bt5/erp5_web_ung_theme/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py?rev=45613&r1=45612&r2=45613&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] Thu Apr 21 17:19:21 2011
@@ -148,7 +148,8 @@ class TestUNG(ERP5TypeTestCase):
 
   def testWebSection_deleteObjectList(self):
     """Test if objects are deleted correctly"""
-    web_page = self.portal.web_page_module.newContent(portal_type="Web Page")
+    web_page_module = self.portal.web_page_module
+    web_page = web_page_module.newContent(portal_type="Web Page")
     relative_url = web_page.getRelativeUrl()
     self.portal.REQUEST.set("uids", [web_page.getUid(),])
     self.stepTic()
@@ -160,9 +161,9 @@ class TestUNG(ERP5TypeTestCase):
     self.portal.WebSection_deleteObjectList()
     self.stepTic()
     self.assertEquals(len(self.portal.portal_catalog(relative_url=relative_url)), 0)
-    web_page = self.portal.web_page_module.newContent(portal_type="Web Page")
-    web_table = self.portal.web_page_module.newContent(portal_type="Web Table")
-    web_illustration = self.portal.web_page_module.newContent(portal_type="Web Illustration")
+    web_page = web_page_module.newContent(portal_type="Web Page")
+    web_table = web_page_module.newContent(portal_type="Web Table")
+    web_illustration = web_page_module.newContent(portal_type="Web Illustration")
     web_page.publish()
     web_table.publish()
     web_illustration.publish()
@@ -177,11 +178,14 @@ class TestUNG(ERP5TypeTestCase):
     self.assertEquals(web_table.getValidationState(), "deleted")
     self.assertEquals(web_illustration.getValidationState(), "deleted")
     self.portal.REQUEST.set("uids", uid_list)
+    id_list = [web_page.getId(),
+               web_table.getId(),
+               web_illustration.getId()]
     self.portal.web_site_module.ung.WebSection_deleteObjectList()
     self.stepTic()
-    self.assertFalse(uid_list[0] in self.portal.web_page_module.objectIds())
-    self.assertFalse(uid_list[1] in self.portal.web_page_module.objectIds())
-    self.assertFalse(uid_list[2] in self.portal.web_page_module.objectIds())
+    self.assertFalse(id_list[0] in web_page_module.objectIds())
+    self.assertFalse(id_list[1] in web_page_module.objectIds())
+    self.assertFalse(id_list[2] in web_page_module.objectIds())
 
   def testERP5Site_userFollowUpWebPage(self):
     """Test if user is added in field Follow Up of Web Page"""

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=45613&r1=45612&r2=45613&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Thu Apr 21 17:19:21 2011
@@ -1 +1 @@
-364
\ No newline at end of file
+365
\ No newline at end of file