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 6432)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_catalog.py	(revision 6433)
@@ -49,4 +49,5 @@
         self.getRootFolder()['app'] = app
         self.app = self.getRootFolder()['app']
+        setSite(self.app)
 
         # Create batch
@@ -62,5 +63,5 @@
         self.ac3 = batch.getAccessCode('APP-1-33333333')
 
-        setSite(self.app)
+
         return
 
@@ -74,2 +75,17 @@
         cat = queryUtility(ICatalog, name='accesscodes_catalog')
         assert cat is not None
+
+    def test_search_by_code(self):
+        # We can find a certain code
+        cat = queryUtility(ICatalog, name='accesscodes_catalog')
+        results = cat.searchResults(code=('APP-1-11111111', 'APP-1-11111111'))
+        results = [x for x in results] # Turn results generator into list
+        assert len(results) == 1
+        assert results[0] is self.ac1
+
+    def test_search_code_not_existent(self):
+        # Not existent codes will not be found
+        cat = queryUtility(ICatalog, name='accesscodes_catalog')
+        results = cat.searchResults(code=('APP-1-blah', 'APP-1-blah'))
+        results = [x for x in results] # Turn results generator into list
+        assert len(results) == 0
