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 6434)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_catalog.py	(revision 6435)
@@ -31,5 +31,5 @@
 from waeup.sirp.testing import FunctionalLayer
 from waeup.sirp.accesscodes.accesscodes import (
-    AccessCode, AccessCodeBatch, invalidate_accesscode,)
+    AccessCode, AccessCodeBatch, invalidate_accesscode, disable_accesscode)
 
 
@@ -104,2 +104,17 @@
         assert len(results) == 1
         assert results[0] is self.ac1
+
+    def test_search_disabled(self):
+        # We can seach for disabled access codes
+        disable_accesscode('APP-1-11111111')
+        # Now we want to find the term ``Tester`` in histories of all acs
+        cat = queryUtility(ICatalog, name='accesscodes_catalog')
+        results1 = cat.searchResults(disabled=(True, True))
+        results2 = cat.searchResults(disabled=(False, False))
+        results1 = [x for x in results1] # Turn results generator into list
+        # We found 1 accescode disabled
+        assert len(results1) == 1
+        assert results1[0] is self.ac1
+        # We found 2 accesscodes not disabled
+        assert len(results2) == 2
+        assert [x for x in results2] == [self.ac2, self.ac3]
