Changeset 6641 for main/waeup.sirp/trunk/src/waeup/sirp

Timestamp:

28 Aug 2011, 08:33:12 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix tests: Use functional tests instead of unit tests to test the new students logger correctly.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students/tests

Files:

• test_browser.py (modified) (1 diff)
• test_container.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -240 +240 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.history_student_path)
-        self.assertMatches('...Student admitted by system...', self.browser.contents)
+        self.assertMatches('...Student admitted by zope.mgr...', self.browser.contents)
 
         return

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_container.py

@@ -18 +18 @@
 """
 import unittest
+import tempfile
+import shutil
 from zope.interface.verify import verifyClass, verifyObject
 from zope.component.interfaces import IFactory
-from zope.app.testing.functional import FunctionalTestCase
+from zope.component.hooks import setSite
+from waeup.sirp.app import University
 from waeup.sirp.students.interfaces import (
     IStudentsContainer,
@@ -27 +30 @@
     StudentsContainer, 
     )
-from waeup.sirp.testing import FunctionalLayer
+from waeup.sirp.testing import (
+    FunctionalLayer, FunctionalTestCase, get_all_loggers, remove_new_loggers,
+    remove_logger)
 
-class StudentsContainerTestCase(unittest.TestCase):
+class StudentsContainerTestCase(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(StudentsContainerTestCase, self).setUp()
+        remove_logger('waeup.sirp.app.students')
+        self.old_loggers = get_all_loggers()
+        # Setup a sample site for each test
+
+        # Prepopulate the ZODB...
+        app = University()
+        self.getRootFolder()['app'] = app
+        self.app = self.getRootFolder()['app']
+        setSite(self.app)
+
+        self.dc_root = tempfile.mkdtemp()
+        app['datacenter'].setStoragePath(self.dc_root)
+        return
+
+    def tearDown(self):
+        super(StudentsContainerTestCase, self).tearDown()
+        remove_new_loggers(self.old_loggers)
+        shutil.rmtree(self.dc_root)
+        return
 
     def test_interfaces(self):
@@ -50 +79 @@
         self.assertRaises(
             NotImplementedError, container.clear)
+
+    def test_logger(self):
+        # We can get a logger from root
+        logger = self.app['students'].logger
+        assert logger is not None
+        assert logger.name == 'waeup.sirp.app.students'
+        handlers = logger.handlers
+        assert len(handlers) == 1
+        filename = logger.handlers[0].baseFilename
+        assert filename.endswith('students.log')
+        assert filename.startswith(self.dc_root)
+
+    def test_logger_multiple(self):
+        # Make sure the logger is still working after 2nd call
+        # First time we call it, it might be registered
+        logger = self.app['students'].logger
+        # At second call the already registered logger should be returned
+        logger = self.app['students'].logger
+        assert logger is not None
+        assert logger.name == 'waeup.sirp.app.students'
+        handlers = logger.handlers
+        assert len(handlers) == 1
+        filename = logger.handlers[0].baseFilename
+        assert filename.endswith('students.log')
+        assert filename.startswith(self.dc_root)