Index: /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_catalog.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_catalog.py	(revision 6471)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_catalog.py	(revision 6472)
@@ -32,4 +32,5 @@
 from waeup.sirp.accesscodes.accesscodes import (
     AccessCode, AccessCodeBatch, invalidate_accesscode, disable_accesscode)
+from waeup.sirp.accesscodes.workflow import INITIALIZED, USED, DISABLED
 
 
@@ -110,6 +111,6 @@
         # Now we want to find the disabled access code
         cat = queryUtility(ICatalog, name='accesscodes_catalog')
-        results1 = cat.searchResults(state=('disabled', 'disabled'))
-        results2 = cat.searchResults(state=('initialized', 'initialized'))
+        results1 = cat.searchResults(state=(DISABLED, DISABLED))
+        results2 = cat.searchResults(state=(INITIALIZED, INITIALIZED))
         results1 = [x for x in results1] # Turn results generator into list
         # We found 1 accescode disabled
@@ -125,6 +126,6 @@
         # Now we want to find the invalidated access code
         cat = queryUtility(ICatalog, name='accesscodes_catalog')
-        results1 = cat.searchResults(state=('used', 'used'))
-        results2 = cat.searchResults(state=('initialized', 'initialized'))
+        results1 = cat.searchResults(state=(USED, USED))
+        results2 = cat.searchResults(state=(INITIALIZED, INITIALIZED))
         results1 = [x for x in results1] # Turn results generator into list
         # We found 1 accescode used
@@ -145,5 +146,5 @@
         # exactly one access code.
         results = cat.searchResults(history='Tester',
-                                    state=('used', 'used'),
+                                    state=(USED, USED),
                                     code=('APP-1-11111111', 'APP-1-22222222'))
         assert len(results) == 1
@@ -154,7 +155,7 @@
         # immediately in catalog
         cat = queryUtility(ICatalog, name='accesscodes_catalog')
-        result = cat.searchResults(state=('used', 'used'))
+        result = cat.searchResults(state=(USED, USED))
         assert len(result) == 0
         invalidate_accesscode('APP-1-11111111')
-        result = cat.searchResults(state=('used', 'used'))
+        result = cat.searchResults(state=(USED, USED))
         assert len(result) == 1
