From 6efc1f6a0c1d1a6bf8d1fa13ca602d3911073bbc Mon Sep 17 00:00:00 2001 From: Sharoon Thomas Date: Wed, 6 Mar 2013 17:00:34 +0100 Subject: [PATCH] Improve trigger tests review690002 --- trytond/test/__init__.py | 1 + trytond/test/trigger.py | 7 ++++++- trytond/tests/test_trigger.py | 25 ++++++++++++++++++++----- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/trytond/test/__init__.py b/trytond/test/__init__.py index 2b58f7147e..6528488867 100644 --- a/trytond/test/__init__.py +++ b/trytond/test/__init__.py @@ -121,6 +121,7 @@ def register(): ExportDataTarget2, ExportDataRelation, Triggered, + TriggerAction, TestAccess, TestWizardStart, WorkflowedModel, diff --git a/trytond/test/trigger.py b/trytond/test/trigger.py index 7c54c77041..3ec71e6a9e 100644 --- a/trytond/test/trigger.py +++ b/trytond/test/trigger.py @@ -3,7 +3,7 @@ from trytond.model import ModelSQL, fields __all__ = [ - 'Triggered', + 'Triggered', 'TriggerAction', ] TRIGGER_LOGS = [] @@ -14,6 +14,11 @@ class Triggered(ModelSQL): __name__ = 'test.triggered' name = fields.Char('Name') + +class TriggerAction(ModelSQL): + 'Trigger Action Model' + __name__ = 'test.trigger_action' + @staticmethod def trigger(records, trigger): ''' diff --git a/trytond/tests/test_trigger.py b/trytond/tests/test_trigger.py index c12642497c..0b9df95e77 100644 --- a/trytond/tests/test_trigger.py +++ b/trytond/tests/test_trigger.py @@ -52,13 +52,16 @@ class TriggerTestCase(unittest.TestCase): model, = self.model.search([ ('model', '=', 'test.triggered'), ]) + action_model, = self.model.search([ + ('model', '=', 'test.trigger_action'), + ]) values = { 'name': 'Test', 'model': model.id, 'on_time': True, 'condition': 'True', - 'action_model': model.id, + 'action_model': action_model.id, 'action_function': 'test', } self.assert_(self.trigger.create([values])) @@ -92,13 +95,16 @@ class TriggerTestCase(unittest.TestCase): model, = self.model.search([ ('model', '=', 'test.triggered'), ]) + action_model, = self.model.search([ + ('model', '=', 'test.trigger_action'), + ]) trigger, = self.trigger.create([{ 'name': 'Test', 'model': model.id, 'on_create': True, 'condition': 'True', - 'action_model': model.id, + 'action_model': action_model.id, 'action_function': 'trigger', }]) @@ -162,13 +168,16 @@ class TriggerTestCase(unittest.TestCase): model, = self.model.search([ ('model', '=', 'test.triggered'), ]) + action_model, = self.model.search([ + ('model', '=', 'test.trigger_action'), + ]) trigger, = self.trigger.create([{ 'name': 'Test', 'model': model.id, 'on_write': True, 'condition': 'True', - 'action_model': model.id, + 'action_model': action_model.id, 'action_function': 'trigger', }]) @@ -272,6 +281,9 @@ class TriggerTestCase(unittest.TestCase): model, = self.model.search([ ('model', '=', 'test.triggered'), ]) + action_model, = self.model.search([ + ('model', '=', 'test.trigger_action'), + ]) triggered, = self.triggered.create([{ 'name': 'Test', @@ -282,7 +294,7 @@ class TriggerTestCase(unittest.TestCase): 'model': model.id, 'on_delete': True, 'condition': 'True', - 'action_model': model.id, + 'action_model': action_model.id, 'action_function': 'trigger', }]) @@ -360,13 +372,16 @@ class TriggerTestCase(unittest.TestCase): model, = self.model.search([ ('model', '=', 'test.triggered'), ]) + action_model, = self.model.search([ + ('model', '=', 'test.trigger_action'), + ]) trigger, = self.trigger.create([{ 'name': 'Test', 'model': model.id, 'on_time': True, 'condition': 'True', - 'action_model': model.id, + 'action_model': action_model.id, 'action_function': 'trigger', }])