Changeset 6452 for main/waeup.sirp/trunk/src/waeup/sirp/applicants

Timestamp:

22 Jun 2011, 13:51:55 (14 years ago)

Author:

Henrik Bettermann

Message:

Replace properties 'used' and 'disabled' by 'status'.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/applicants

Files:

• authentication.py (modified) (1 diff)
• tests/test_authentication.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/authentication.py

@@ -228 +228 @@
         if ac is None:
             return None
-        if ac.disabled is not False:
-            return None
-        if ac.used is not False and appl_ac != ac.representation:
+        if ac.status == 'disabled':
+            return None
+        if ac.status == 'used' and appl_ac != ac.representation:
             return None
         if appl_ac is not None and appl_ac != ac.representation:

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

@@ -50 +50 @@
 
 class FakeAccessCode(object):
-    def __init__(self, repr, inv_date=None, disabled=False):
-        self.used = inv_date is not None
+    def __init__(self, repr, status = 'initialized'):
         self.representation = repr
-        self.disabled = disabled
-
-class FakeInvAccessCode(object):
-    invalidation_date = True
+        self.status = status
 
 class FakeApplication(object):
@@ -71 +67 @@
                 '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'),
+                'APP-77777': FakeApplication(u'APP-77777'),
                 },
             },
@@ -82 +73 @@
             'APP': FakeBatch({
                     'APP-12345': FakeAccessCode('APP-12345'),
-                    'APP-54321': FakeAccessCode('APP-54321', True),
+                    'APP-54321': FakeAccessCode('APP-54321', 'used'),
                     '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),
+                    'APP-33333': FakeAccessCode('APP-33333', 'used'),
+                    'APP-44444': FakeAccessCode('APP-44444', 'used'),
+                    'APP-55555': FakeAccessCode('APP-55555', 'used'),
+                    'APP-66666': FakeAccessCode('APP-66666', 'disabled'),
+                    'APP-77777': FakeAccessCode('APP-77777', 'disabled'),
                     })
             }
@@ -166 +157 @@
             dict(accesscode='APP-77777'))
         assert result is None
+
         return