More usage of setup and teardown.

2 files changed, 12 insertions, 10 deletions

diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py
index 17083656f..0c44baf16 100644
--- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py
+++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py
@@ -8,14 +8,15 @@ def _initTestingDB():
 
 class TestMyView(unittest.TestCase):
     def setUp(self):
+        testing.setUp()
         _initTestingDB()
-        
-    def _callFUT(self, request):
-        from tutorial.views import my_view
-        return my_view(request)
+
+    def tearDown(self):
+        testing.tearDown()
 
     def test_it(self):
+        from tutorial.views import my_view
         request = testing.DummyRequest()
-        info = self._callFUT(request)
+        info = my_view(request)
         self.assertEqual(info['root'].name, 'root')
         self.assertEqual(info['project'], 'tutorial')
diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py b/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py
index 17083656f..0c44baf16 100644
--- a/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py
+++ b/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py
@@ -8,14 +8,15 @@ def _initTestingDB():
 
 class TestMyView(unittest.TestCase):
     def setUp(self):
+        testing.setUp()
         _initTestingDB()
-        
-    def _callFUT(self, request):
-        from tutorial.views import my_view
-        return my_view(request)
+
+    def tearDown(self):
+        testing.tearDown()
 
     def test_it(self):
+        from tutorial.views import my_view
         request = testing.DummyRequest()
-        info = self._callFUT(request)
+        info = my_view(request)
         self.assertEqual(info['root'].name, 'root')
         self.assertEqual(info['project'], 'tutorial')