[silva.app.mediacontent][Sylvain Viollon] Update tests.

[email protected] Fri, 30 Aug 2013 14:25:26 +0200
Newsgroups gmane.comp.web.zope.silva.cvs
Message-ID <[email protected]>
author:    Sylvain Viollon
date:      Fri Aug 30 14:25:23 2013 +0200
revision:  29:bfdec1b55206 in silva.app.mediacontent
branch:    
details:   https://hg.infrae.com/silva.app.mediacontent?cmd=changeset;node=bfdec1b55206
modified:  src/silva/app/mediacontent/tests/test_xml_export.py
added:     
removed:   
log:       Update tests.


diffstat:

 src/silva/app/mediacontent/tests/test_xml_export.py |  47 +++++++++++---------
 1 files changed, 25 insertions(+), 22 deletions(-)

diffs (74 lines):

diff -r b74eecc3c8f2 -r bfdec1b55206 src/silva/app/mediacontent/tests/test_xml_export.py
--- a/src/silva/app/mediacontent/tests/test_xml_export.py	Thu May 23 16:12:50 2013 +0200
+++ b/src/silva/app/mediacontent/tests/test_xml_export.py	Fri Aug 30 14:25:23 2013 +0200
@@ -4,7 +4,7 @@
 
 import unittest
 
-from Products.Silva.testing import TestRequest
+from Products.Silva.testing import TestRequest, Transaction
 from Products.Silva.tests.test_xml_export import SilvaXMLTestCase
 
 from silva.core.contentlayout.interfaces import IBlockManager, IBlockController
@@ -20,16 +20,18 @@
 
     def setUp(self):
         self.root = self.layer.get_application()
-        self.layer.login('chiefeditor')
-        factory = self.root.manage_addProduct['Silva']
-        factory.manage_addFolder('export', 'Export')
+        with Transaction():
+            self.layer.login('chiefeditor')
+            factory = self.root.manage_addProduct['Silva']
+            factory.manage_addFolder('export', 'Export')
 
     def test_export_mediacontent(self):
-        factory = self.root.export.manage_addProduct['silva.app.mediacontent']
-        factory.manage_addMediaContent('bear', 'Bear')
-        content = self.root.export._getOb('bear')
-        version = content.get_editable()
-        version.set_external_url('http://infrae.com')
+        with Transaction():
+            factory = self.root.export.manage_addProduct['silva.app.mediacontent']
+            factory.manage_addMediaContent('bear', 'Bear')
+            content = self.root.export._getOb('bear')
+            version = content.get_editable()
+            version.set_external_url('http://infrae.com')
 
         exporter = self.assertExportEqual(
             self.root.export,
@@ -39,20 +41,21 @@
         self.assertEqual(exporter.getProblems(), [])
 
     def test_export_sildeshow_block(self):
-        factory = self.root.export.manage_addProduct['Silva']
-        factory.manage_addFolder('images', 'Images')
-        factory = self.root.export.manage_addProduct['silva.core.contentlayout']
-        factory.manage_addMockupPage('page', 'Page')
+        with Transaction():
+            factory = self.root.export.manage_addProduct['Silva']
+            factory.manage_addFolder('images', 'Images')
+            factory = self.root.export.manage_addProduct['silva.core.contentlayout']
+            factory.manage_addMockupPage('page', 'Page')
 
-        page = self.root.export.page
-        version = page.get_editable()
-        version.set_design(registry.lookup_design_by_name('adesign'))
-        slideshow = SlideshowBlock(u'slideshow 1')
-        controller = getWrapper(
-            (slideshow, version, TestRequest()),
-            IBlockController)
-        controller.container = self.root.export.images
-        IBlockManager(version).add('one', slideshow)
+            page = self.root.export.page
+            version = page.get_editable()
+            version.set_design(registry.lookup_design_by_name('adesign'))
+            slideshow = SlideshowBlock(u'slideshow 1')
+            controller = getWrapper(
+                (slideshow, version, TestRequest()),
+                IBlockController)
+            controller.container = self.root.export.images
+            IBlockManager(version).add('one', slideshow)
 
         exporter = self.assertExportEqual(
             self.root.export,