Changeset 7333 for main/waeup.sirp/trunk/src/waeup/sirp/university/tests

Timestamp:

12 Dec 2011, 07:01:54 (13 years ago)

Author:

Henrik Bettermann

Message:

Rename certificatecontainer, coursecontainer and facultycontainer. Now we have e.g. a container for faculties. Synonyms are 'facultiescontainer', 'faculties', 'academics' or 'Academic Section'. The faculty container is the faculty itself which contains the departments.

Location:

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

Files:

• test_certificatescontainer.py (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_certificatecontainer.py) (8 diffs)
• test_coursescontainer.py (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_coursecontainer.py) (1 diff)
• test_facultiescontainer.py (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_facultycontainer.py) (6 diffs)
• test_university.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_certificatescontainer.py

@@ -30 +30 @@
     FunctionalLayer, doctestsuite_for_module, FunctionalTestCase)
 from waeup.sirp.university.certificate import Certificate
-from waeup.sirp.university.certificatecontainer import CertificateContainer
-from waeup.sirp.university.interfaces import ICertificateContainer
+from waeup.sirp.university.certificatescontainer import CertificatesContainer
+from waeup.sirp.university.interfaces import ICertificatesContainer
 
 
-class CertificateContainerTests(FunctionalTestCase):
+class CertificatesContainerTests(FunctionalTestCase):
 
     layer = FunctionalLayer
 
     def setUp(self):
-        super(CertificateContainerTests, self).setUp()
+        super(CertificatesContainerTests, self).setUp()
 
         # Setup a sample site for each test
@@ -52 +52 @@
 
     def tearDown(self):
-        super(CertificateContainerTests, self).tearDown()
+        super(CertificatesContainerTests, self).tearDown()
         clearSite()
         shutil.rmtree(self.dc_root)
@@ -58 +58 @@
     def test_create(self):
         # we can create instances
-        container = CertificateContainer()
-        result = isinstance(container, CertificateContainer)
+        container = CertificatesContainer()
+        result = isinstance(container, CertificatesContainer)
         assert result is True
 
-    def test_provides_icertificatecontainer(self):
+    def test_provides_icertificatescontainer(self):
         # instances tell they provide their main interface
-        container = CertificateContainer()
-        result = ICertificateContainer.providedBy(container)
+        container = CertificatesContainer()
+        result = ICertificatesContainer.providedBy(container)
         assert result is True
 
     def test_interfaces(self):
         # class and instances comply with their main interface
-        container = CertificateContainer()
-        self.assertTrue(verifyClass(ICertificateContainer, CertificateContainer))
-        self.assertTrue(verifyObject(ICertificateContainer, container))
+        container = CertificatesContainer()
+        self.assertTrue(verifyClass(ICertificatesContainer, CertificatesContainer))
+        self.assertTrue(verifyObject(ICertificatesContainer, container))
 
     def test_add_certificate_non_icertificate(self):
         # we cannot add certificates that do not implement ICertificate.
-        container = CertificateContainer()
+        container = CertificatesContainer()
         self.assertRaises(
             TypeError, container.addCertificate, 'some_string')
@@ -82 +82 @@
     def test_add_certificate_no_duplicate_entry(self):
         # we cannot add certificates that are registered already.
-        container = CertificateContainer()
+        container = CertificatesContainer()
         # We must place this container in the ZODB to make catalogs work.
         self.app['certs'] = container
@@ -94 +94 @@
     def test_setitem_duplicate_entry(self):
         # we cannot add certificates whose code exists already in catalog
-        container1 = CertificateContainer()
-        container2 = CertificateContainer()
+        container1 = CertificatesContainer()
+        container2 = CertificatesContainer()
         self.app['certs1'] = container1 # enable catalogs
         self.app['certs2'] = container2
@@ -108 +108 @@
     def test_setitem_name_unequal_code(self):
         # we cannot add certificates whose code != key
-        container = CertificateContainer()
+        container = CertificatesContainer()
         self.app['certs'] = container # enable catalogs
         cert1 = Certificate(code="CERT1")
@@ -118 +118 @@
     def test_clear(self):
         # clear() really empties the container.
-        container = CertificateContainer()
+        container = CertificatesContainer()
         self.app['certs'] = container # enable catalogs
         cert1 = Certificate(code="CERT1")
@@ -130 +130 @@
 def test_suite():
     suite = unittest.TestSuite((
-        unittest.makeSuite(CertificateContainerTests),
+        unittest.makeSuite(CertificatesContainerTests),
         doctestsuite_for_module(
-                'waeup.sirp.university.certificatecontainer'),
+                'waeup.sirp.university.certificatescontainer'),
         ))
     return suite

main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_coursescontainer.py

@@ -21 +21 @@
 import unittest
 from zope.interface.verify import verifyClass, verifyObject
-from waeup.sirp.university.interfaces import ICourseContainer
-from waeup.sirp.university import CourseContainer, Course
+from waeup.sirp.university.interfaces import ICoursesContainer
+from waeup.sirp.university import CoursesContainer, Course
 
-class CourseContainerTests(unittest.TestCase):
+class CoursesContainerTests(unittest.TestCase):
 
     def test_ifaces(self):
-        container = CourseContainer()
-        self.assertTrue(verifyClass(ICourseContainer, CourseContainer))
-        self.assertTrue(verifyObject(ICourseContainer, container))
+        container = CoursesContainer()
+        self.assertTrue(verifyClass(ICoursesContainer, CoursesContainer))
+        self.assertTrue(verifyObject(ICoursesContainer, container))
 
     def test_setitem_name_ne_code(self):
         # If we add a course under a wrong name that will give an error
-        container = CourseContainer()
+        container = CoursesContainer()
         course = Course(code='MYCOURSE')
         self.assertRaises(

main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_facultiescontainer.py

@@ -17 +17 @@
 ##
 
-# Tests for FacultyContainer.
+# Tests for FacultiesContainer.
 import logging
 import unittest
@@ -23 +23 @@
 from zope.interface.verify import verifyObject, verifyClass
 from waeup.sirp.testing import FunctionalTestCase, FunctionalLayer
-from waeup.sirp.university.interfaces import IFacultyContainer
-from waeup.sirp.university import FacultyContainer
-from waeup.sirp.university.facultycontainer import AcademicsPlugin
+from waeup.sirp.university.interfaces import IFacultiesContainer
+from waeup.sirp.university import FacultiesContainer
+from waeup.sirp.university.facultiescontainer import AcademicsPlugin
 
 class FakeLogger(object):
@@ -54 +54 @@
         return result
 
-class FacultyContainerTests(unittest.TestCase):
+class FacultiesContainerTests(unittest.TestCase):
 
     def test_ifaces(self):
-        container = FacultyContainer()
-        self.assertTrue(verifyClass(IFacultyContainer, FacultyContainer))
-        self.assertTrue(verifyObject(IFacultyContainer, container))
+        container = FacultiesContainer()
+        self.assertTrue(verifyClass(IFacultiesContainer, FacultiesContainer))
+        self.assertTrue(verifyObject(IFacultiesContainer, container))
 
 class AcademicsPluginTests(unittest.TestCase):
@@ -76 +76 @@
         plugin.setup(site, 'testsite', logger)
         self.assertTrue('faculties' in site.keys())
-        self.assertTrue(isinstance(site['faculties'], FacultyContainer))
+        self.assertTrue(isinstance(site['faculties'], FacultiesContainer))
         self.assertEqual(
             self._logger_factory.get_messages(),
-            'Created faculty container for University\n'
+            'Container for faculties created\n'
             )
 
@@ -90 +90 @@
         self.assertEqual(
             self._logger_factory.get_messages(),
-            'Could not create faculty container in SIRP.\n'
+            'Could not create container for faculties in SIRP.\n'
             )
 
@@ -99 +99 @@
         plugin.update(site, 'testsite', logger)
         self.assertTrue('faculties' in site.keys())
-        self.assertTrue(isinstance(site['faculties'], FacultyContainer))
+        self.assertTrue(isinstance(site['faculties'], FacultiesContainer))
         self.assertEqual(
             self._logger_factory.get_messages(),
-            'Created faculty container for University\n'
+            'Container for faculties created\n'
             )
 

main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_university.py

@@ -27 +27 @@
         names = globals().keys()
         self.assertTrue('Course' in names)
-        self.assertTrue('CourseContainer' in names)
+        self.assertTrue('CoursesContainer' in names)
         self.assertTrue('Faculty' in names)
-        self.assertTrue('FacultyContainer' in names)
+        self.assertTrue('FacultiesContainer' in names)
 
 def test_suite():