Changeset 6452 for main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests

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/accesscodes/tests

Files:

• test_accesscodes.py (modified) (2 diffs)
• test_catalog.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_accesscodes.py

@@ -106 +106 @@
 
     def test_invalidate_accesscode(self):
-        assert self.ac1.used is False
+        assert self.ac1.status != USED
         result = invalidate_accesscode('APP-1-11111111')
-        assert self.ac1.used is True
+        assert self.ac1.status == USED
         assert result is True
 
     def test_disable_accesscode_unused(self):
         # we can disable initialized acs
-        assert self.ac1.disabled is False
+        assert self.ac1.status != USED
         disable_accesscode('APP-1-11111111')
-        assert self.ac1.disabled is True
+        assert self.ac1.status == DISABLED
 
     def test_disable_accesscode_used(self):
         # we can disable already used acs
-        assert self.ac1.disabled is False
+        assert self.ac1.status != DISABLED
         invalidate_accesscode('APP-1-11111111')
         disable_accesscode('APP-1-11111111')
-        assert self.ac1.disabled is True
+        assert self.ac1.status == DISABLED
 
     def test_reenable_accesscode(self):
@@ -129 +129 @@
         result = reenable_accesscode('APP-1-11111111')
         assert result is True
-        assert self.ac1.disabled is False
+        assert self.ac1.status != USED
 
     def test_fire_transition(self):

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_catalog.py

@@ -110 +110 @@
         # Now we want to find the disabled access code
         cat = queryUtility(ICatalog, name='accesscodes_catalog')
-        results1 = cat.searchResults(disabled=(True, True))
-        results2 = cat.searchResults(disabled=(False, False))
+        results1 = cat.searchResults(status=('disabled', 'disabled'))
+        results2 = cat.searchResults(status=('initialized', 'initialized'))
         results1 = [x for x in results1] # Turn results generator into list
         # We found 1 accescode disabled
@@ -125 +125 @@
         # Now we want to find the invalidated access code
         cat = queryUtility(ICatalog, name='accesscodes_catalog')
-        results1 = cat.searchResults(used=(True, True))
-        results2 = cat.searchResults(used=(False, False))
+        results1 = cat.searchResults(status=('used', 'used'))
+        results2 = cat.searchResults(status=('initialized', 'initialized'))
         results1 = [x for x in results1] # Turn results generator into list
         # We found 1 accescode used
@@ -145 +145 @@
         # exactly one access code.
         results = cat.searchResults(history='Tester',
-                                    used=(True, True),
+                                    status=('used', 'used'),
                                     code=('APP-1-11111111', 'APP-1-22222222'))
         assert len(results) == 1
@@ -154 +154 @@
         # immediately in catalog
         cat = queryUtility(ICatalog, name='accesscodes_catalog')
-        result = cat.searchResults(used=(True, True))
+        result = cat.searchResults(status=('used', 'used'))
         assert len(result) == 0
         invalidate_accesscode('APP-1-11111111')
-        result = cat.searchResults(used=(True, True))
+        result = cat.searchResults(status=('used', 'used'))
         assert len(result) == 1