Changeset 12195 for main/waeup.ikoba/trunk

Timestamp:

11 Dec 2014, 08:21:43 (10 years ago)

Author:

Henrik Bettermann

Message:

Improve tests.

Adjust logging.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• customers/tests/test_catalog.py (modified) (2 diffs)
• products/product.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_catalog.py

@@ -177 +177 @@
         # that the product object attribute of a contract is cleared
         # but the last_product_id is not.
+        self.assertTrue(self.contract.product_object is self.product)
         del self.app['products'][self.product_id]
         self.assertTrue(self.contract.product_object is None)
+        # The document referrer wasn't touched.
+        self.assertTrue(self.contract.document_object is self.document)
         self.assertEqual(self.contract.last_product_id, 'SAM')
+        # We can still find the contract by last_product_id.
         cat = queryUtility(ICatalog, name='contracts_catalog')
         results = cat.searchResults(last_product_id=('SAM', 'SAM'))
@@ -191 +195 @@
         logcontent = open(logfile).read()
         self.assertTrue(
-            'INFO - system - ObjectRemovedEvent - K1000000 - c101 - removed: product\n'
+            'INFO - system - ObjectRemovedEvent - K1000000 - c101 - removed: SAM\n'
             in logcontent)
 
     def test_document_removal(self):
-        # Actually, this test does not test catalog components at all.
-        # Tt only ensures that the document object attributes of a contract
-        # are cleared, like in the test_product_removal above.
+        # This test does not test catalog components at all.
+        # It only ensures that the document object attributes of a contract
+        # are cleared, when a document is removed, much like in the
+        # test_product_removal above.
+        self.assertTrue(self.contract.document_object is self.document)
         del self.customer['documents'][self.document_id]
         self.assertTrue(self.contract.document_object is None)
+        # The product referrer wasn't touched.
+        self.assertTrue(self.contract.product_object is self.product)
         # Document removal is being logged in customers.log
         logfile = os.path.join(

main/waeup.ikoba/trunk/src/waeup/ikoba/products/product.py

@@ -82 +82 @@
         notify(grok.ObjectModifiedEvent(contract))
         contract.customer.__parent__.logger.info(
-            'ObjectRemovedEvent - %s - %s - removed: product' % (
-                contract.customer.customer_id, contract.contract_id))
+            'ObjectRemovedEvent - %s - %s - removed: %s' % (
+                contract.customer.customer_id,
+                contract.contract_id,
+                prodid))
     return