[Erp5-report] r31301 daniele - /erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py

[nobody at svn.erp5.org]

Author: daniele
Date: Tue Dec 15 11:34:58 2009
New Revision: 31301

URL: http://svn.erp5.org?rev=31301&view=rev
Log:
Modify assertWorkflowTransitionFails for the validation_state 

Modified:
    erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=31301&r1=31300&r2=31301&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Tue Dec 15 11:34:58 2009
@@ -30,6 +30,7 @@
 
 # store a copy of the original method
 original_get_request = Globals.get_request
+convertToUpperCase = Products.ERP5Type.Utils.convertToUpperCase
 
 def get_request():
   if current_app is not None:
@@ -715,7 +716,8 @@
       self.assertEquals(len(a), len(b), msg)
     assertSameSet = failIfDifferentSet
 
-    def assertWorkflowTransitionFails(self, object, workflow_id, transition_id, error_message=None):
+    def assertWorkflowTransitionFails(self, object, workflow_id, transition_id,
+        error_message=None, state_variable='simulation_state'):
       """
         Check that passing given transition from given workflow on given object
         raises ValidationFailed.
@@ -726,14 +728,16 @@
       """
       workflow_tool = self.getWorkflowTool()
       reference_history_length = len(workflow_tool.getInfoFor(ob=object, name='history', wf_id=workflow_id))
-      reference_workflow_state = object.getSimulationState()
+      state_method = 'get' + convertToUpperCase(state_variable)
+      method = getattr(object, state_method, None)
+      reference_workflow_state = method()
       self.assertRaises(ValidationFailed, workflow_tool.doActionFor, object, transition_id, wf_id=workflow_id)
       workflow_history = workflow_tool.getInfoFor(ob=object, name='history', wf_id=workflow_id)
       self.assertEqual(len(workflow_history), reference_history_length + 1)
       workflow_error_message = str(workflow_history[-1]['error_message'])
       if error_message is not None:
         self.assertEqual(workflow_error_message, error_message)
-      self.assertEqual(object.getSimulationState(), reference_workflow_state)
+      self.assertEqual(method(), reference_workflow_state)
       return workflow_error_message
 
     def startZServer(self):