[Erp5-report] r25336 - in /erp5/trunk/products/CMFActivity: skins/activity/ tests/

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jan 28 15:43:21 2009
New Revision: 25336

URL: http://svn.erp5.org?rev=25336&view=rev
Log:
remove cache on hasMessage, and add test for ActiveObject.hasActivity

Modified:
    erp5/trunk/products/CMFActivity/skins/activity/SQLDict_hasMessage.zsql
    erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_hasMessage.zsql
    erp5/trunk/products/CMFActivity/tests/testCMFActivity.py

Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_hasMessage.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_hasMessage.zsql?rev=25336&r1=25335&r2=25336&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_hasMessage.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_hasMessage.zsql [utf8] Wed Jan 28 15:43:21 2009
@@ -2,8 +2,8 @@
 title:
 connection_id:cmf_activity_sql_connection
 max_rows:1
-max_cache:100
-cache_time:1
+max_cache:0
+cache_time:0
 class_name:
 class_file:
 </dtml-comment>

Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_hasMessage.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_hasMessage.zsql?rev=25336&r1=25335&r2=25336&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_hasMessage.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_hasMessage.zsql [utf8] Wed Jan 28 15:43:21 2009
@@ -2,8 +2,8 @@
 title:
 connection_id:cmf_activity_sql_connection
 max_rows:1
-max_cache:100
-cache_time:1
+max_cache:0
+cache_time:0
 class_name:
 class_file:
 </dtml-comment>

Modified: erp5/trunk/products/CMFActivity/tests/testCMFActivity.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/tests/testCMFActivity.py?rev=25336&r1=25335&r2=25336&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/tests/testCMFActivity.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/tests/testCMFActivity.py [utf8] Wed Jan 28 15:43:21 2009
@@ -3205,6 +3205,20 @@
     finally:
       delattr(Organisation, 'waitingActivity')
       Queue.tic = original_queue_tic
+  
+  def test_active_object_hasActivity(self):
+    active_object = self.portal.organisation_module.newContent(
+                                            portal_type='Organisation')
+    get_transaction().commit()
+    self.tic()
+    self.assertFalse(active_object.hasActivity())
+    for activity in ('SQLDict', 'SQLQueue'):
+      active_object.activate(activity=activity).getTitle()
+      get_transaction().commit()
+      self.assertTrue(active_object.hasActivity(), activity)
+      self.tic()
+      self.assertFalse(active_object.hasActivity(), activity)
+
 
 def test_suite():
   suite = unittest.TestSuite()