Changeset 5801

Timestamp:

7 Mar 2011, 02:27:39 (14 years ago)

Author:

uli

Message:

Fix tests to use correct folder names for applicant container and
jambdata container.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_util.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_util.py

@@ -25 +25 @@
 from zope.component.hooks import setSite
 from zope.site import LocalSiteManager
-from zope.site.folder import Folder
-from zope.site.testing import siteSetUp, siteTearDown
-from waeup.sirp.applicants.tests.test_authentication import (
-    FakeSite)
 from waeup.sirp.applicants.jambtables.util import (
     application_exists, get_applicant_data
     )
+from waeup.sirp.app import University
+from waeup.sirp.applicants import Applicant
+from waeup.sirp.applicants.container import ApplicantsContainer
+from waeup.sirp.testing import WAeUPSIRPUnitTestLayer
+
+fake_apps = {
+    'pude10' : ApplicantsContainer(),
+    'pude11' : ApplicantsContainer(),
+    }
+
+fake_apps['pude10']['APP-99999'] = Applicant()
+
 
 class HelperToolsTest(unittest.TestCase):
 
+    layer = WAeUPSIRPUnitTestLayer
+    
     def setUp(self):
-        self.root = Folder()
-        siteSetUp(self.root)
-        self.app = FakeSite() #grok.Application()
-        self.root['app'] = self.app
+        self.app = University()
+        # Fill up some JAMB data...
+        self.app['jambdata']['91100546DD'] = Applicant()
+        self.app['jambdata']['91100546DE'] = Applicant()
+        # Insert some applicants...
+        for container, data in fake_apps.items():
+            self.app['applicants'][container] = data
         self.app.setSiteManager(LocalSiteManager(self.app))
         setSite(self.app)
@@ -45 +58 @@
 
     def tearDown(self):
-        siteTearDown()
-        return
+        pass
 
     def test_application_exists(self):
@@ -54 +66 @@
         result = application_exists('APP-44444')
         assert result is True
-        
         return
+
 
 def test_suite():
@@ -62 +74 @@
         HelperToolsTest,
         ]:
-        suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
-                testcase
-                )
-        )
+        suite.addTests(unittest.makeSuite(testcase))
     return suite