Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_certificatecontainer.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_certificatecontainer.py	(revision 6240)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_certificatecontainer.py	(revision 6241)
@@ -98,15 +98,28 @@
     def test_setitem_duplicate_entry(self):
         # we cannot add certificates whose code exists already in catalog
+        container1 = CertificateContainer()
+        container2 = CertificateContainer()
+        self.app['certs1'] = container1 # enable catalogs
+        self.app['certs2'] = container2
+        cert1 = Certificate(code="CERT1")
+        cert2 = Certificate(code="CERT1")
+        self.app['certs1']['CERT1'] = cert1
+        self.assertRaises(
+            DuplicationError,
+            self.app['certs2'].__setitem__, 'CERT1', cert2)
+        assert len(container2) == 0
+
+    def test_setitem_name_unequal_code(self):
+        # we cannot add certificates whose code != key
         container = CertificateContainer()
         self.app['certs'] = container # enable catalogs
         cert1 = Certificate(code="CERT1")
-        cert2 = Certificate(code="CERT1")
-        self.app['certs']['SomeKey'] = cert1
         self.assertRaises(
-            DuplicationError,
-            container.__setitem__, 'OtherKey', cert2)
-        assert len(container) == 1
+            ValueError,
+            container.__setitem__, 'OtherKey', cert1)
+        assert len(container) == 0
 
     def test_clear(self):
+        # clear() really empties the container.
         container = CertificateContainer()
         self.app['certs'] = container # enable catalogs
