Changeset 6123 for main

Timestamp:

17 May 2011, 23:41:15 (14 years ago)

Author:

uli

Message:

• Remove whitespaces
• Make authentication tests work again.

Authentication tests now require a complete functional setup, because
we the get_applicant_data() function used by the authentication
plugins now looks up catalogs and catalogs are only filled when real
Applicant objects are added to the ZODB (no FakeApplicants? as we did
yet).

The tests still fail, but this is due to a real bug we have to fix:
get_applicant_data does not lookup the name attribute of
applicants any more, but the access_code attribute. As the authenticator
plugin looks for some applicant stored under a certain name (and not
with a certain access_code attribute) the authentication can succeed
with invalid applicant data.

It's very good, we had these test, because this one was really
difficult to discover. Took me plenty hours to realize what happened
here.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_authentication.py (modified) (8 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_authentication.py

@@ -38 +38 @@
 from waeup.sirp.testing import FunctionalLayer
 from waeup.sirp.app import University
+from waeup.sirp.applicants import  ApplicantsContainer, Applicant
 from waeup.sirp.applicants.authentication import (
     ApplicantsAuthenticatorPlugin, WAeUPApplicantCredentialsPlugin,
     ApplicantCredentials, AuthenticatedApplicantPrincipalFactory,
-    ApplicantPrincipalInfo, ApplicantPrincipal)
+    ApplicantPrincipalInfo, ApplicantPrincipal,)
 
 
@@ -66 +67 @@
         self['applicants'] = {
             'APP': {
-                'APP-12345': FakeApplication('APP-12345'),
-                'APP-54321': FakeApplication('APP-54321'),
-                'APP-22222': FakeApplication('APP-OTHER'),
+                'APP-12345': FakeApplication(u'APP-12345'),
+                'APP-54321': FakeApplication(u'APP-54321'),
+                'APP-22222': FakeApplication(u'APP-OTHER'),
                 'APP-44444': FakeApplication(),
-                'APP-55555': FakeApplication('APP-OTHER'),
+                'APP-55555': FakeApplication(u'APP-OTHER'),
                 },
             'JAMB': {
                 'JAMB1': FakeApplication(),
-                'JAMB2': FakeApplication('APP-12345'),
-                'JAMB3': FakeApplication('APP-54321'),
-                'JAMB4': FakeApplication('APP-44444'),
+                'JAMB2': FakeApplication(u'APP-12345'),
+                'JAMB3': FakeApplication(u'APP-54321'),
+                'JAMB4': FakeApplication(u'APP-44444'),
                 },
             }
@@ -93 +94 @@
             }
 
-class AuthenticatorPluginTest(unittest.TestCase):
+def FakeSite():
+    return {
+        'applicants': {
+            'APP': {
+                'APP-12345': FakeApplication(u'APP-12345'),
+                'APP-54321': FakeApplication(u'APP-54321'),
+                'APP-22222': FakeApplication(u'APP-OTHER'),
+                'APP-44444': FakeApplication(),
+                'APP-55555': FakeApplication(u'APP-OTHER'),
+                },
+            'JAMB': {
+                'JAMB1': FakeApplication(),
+                'JAMB2': FakeApplication(u'APP-12345'),
+                'JAMB3': FakeApplication(u'APP-54321'),
+                'JAMB4': FakeApplication(u'APP-44444'),
+                },
+            },
+        'accesscodes': {
+            'APP': FakeBatch({
+                    'APP-12345': FakeAccessCode('APP-12345'),
+                    'APP-54321': FakeAccessCode('APP-54321', True),
+                    'APP-11111': FakeAccessCode('APP-11111'),
+                    'APP-22222': FakeAccessCode('APP-22222'),
+                    'APP-33333': FakeAccessCode('APP-33333', True),
+                    'APP-44444': FakeAccessCode('APP-44444', True),
+                    'APP-55555': FakeAccessCode('APP-55555', True),
+                    'APP-66666': FakeAccessCode('APP-66666', True, False),
+                    'APP-77777': FakeAccessCode('APP-77777', False, False),
+                    })
+            }
+        }
+
+class AuthenticatorPluginTest(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def create_applicant(self, cname, aname, ac=None):
+        # Create an applicant in an applicants container
+        setSite(self.app)
+        if not cname in self.app['applicants'].keys():
+            container = ApplicantsContainer()
+            self.app['applicants'][cname] = container
+        applicant = Applicant()
+        if ac is not None:
+            applicant.access_code = ac
+        self.app['applicants'][cname][aname] = applicant
+        return
 
     def setUp(self):
-        self.app = FakeSite()
-        self.app.setSiteManager(LocalSiteManager(self.app))
+        super(AuthenticatorPluginTest, self).setUp()
+
+        # Setup a sample site for each test
+        app = University()
+        self.dc_root = tempfile.mkdtemp()
+        app['datacenter'].setStoragePath(self.dc_root)
+
+        # Prepopulate the ZODB...
+        self.getRootFolder()['app'] = app
+        self.app = self.getRootFolder()['app']
+
+        fake_site = FakeSite()
+        for ckey, fake_container in fake_site['applicants'].items():
+            for akey, fake_appl in fake_container.items():
+                self.create_applicant(ckey, akey, fake_appl.access_code)
+        del self.app['accesscodes']
+        self.app['accesscodes'] = fake_site['accesscodes']
+
         self.plugin = ApplicantsAuthenticatorPlugin()
-        setSite(self.app)
         return
 
     def tearDown(self):
-        clearSite()
+        super(AuthenticatorPluginTest, self).tearDown()
+        shutil.rmtree(self.dc_root)
         return
 
@@ -120 +183 @@
         # Possible cases, where formal correct authentication
         # data is not valid:
+        # XXX: fails
         result = self.plugin.authenticateCredentials(
             dict(accesscode='APP-22222'))
@@ -131 +195 @@
             dict(accesscode='APP-44444'))
         assert result is None
-        
+
         result = self.plugin.authenticateCredentials(
             dict(accesscode='APP-55555'))
@@ -177 +241 @@
     def get(self, key, default=None):
         return self.__getitem__(key, default)
-    
+
     def __getitem__(self, key, default=None):
         return session_data.get(key, default)
@@ -317 +381 @@
     # credentials plugin) to be registered with the local PAU. Admins
     # can remove these components on the fly later-on if they wish.
-    
+
     layer = FunctionalLayer
-    
+
     def setUp(self):
         super(PAUSetupTest, self).setUp()
@@ -348 +412 @@
         cred_names = [name for name, plugin in cred_plugins]
         auth_names = [name for name, plugin in auth_plugins]
-        
+
         # Make sure our local ApplicantsAuthenticatorPlugin is registered...
         self.assertTrue('applicants' in auth_names)