changeset 686:ffac68f1c5ce

Update action tests
author Neil Muller <drnlmuller@gmail.com>
date Wed, 11 Sep 2013 16:35:53 +0200
parents 7ad528f7d17c
children 45d2a6aef3a4
files nagslang/tests/test_environment.py
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/nagslang/tests/test_environment.py	Wed Sep 11 16:35:41 2013 +0200
+++ b/nagslang/tests/test_environment.py	Wed Sep 11 16:35:53 2013 +0200
@@ -101,8 +101,8 @@
     def make_action_func(self, name):
         self.state.setdefault(name, [])
 
-        def action_func(protagonist, target):
-            self.state[name].append((protagonist, target))
+        def action_func(protagonist):
+            self.state[name].append(protagonist)
             return len(self.state[name])
 
         return action_func
@@ -121,10 +121,10 @@
         self.assert_state(action=[])
         self.assertTrue(action.check(None))
         self.assert_state(action=[])
-        self.assertEqual(1, action.perform('p', 't'))
-        self.assert_state(action=[('p', 't')])
-        self.assertEqual(2, action.perform('p2', 't2'))
-        self.assert_state(action=[('p', 't'), ('p2', 't2')])
+        self.assertEqual(1, action.perform('p'))
+        self.assert_state(action=['p'])
+        self.assertEqual(2, action.perform('p2'))
+        self.assert_state(action=['p', 'p2'])
 
     def test_conditional_action(self):
         yes_action = self.make_action('yes_action', YesCondition())
@@ -134,15 +134,15 @@
         self.assert_state(yes_action=[], no_action=[])
         self.assertFalse(no_action.check(None))
         self.assert_state(yes_action=[], no_action=[])
-        self.assertEqual(1, yes_action.perform('p', 't'))
-        self.assert_state(yes_action=[('p', 't')], no_action=[])
+        self.assertEqual(1, yes_action.perform('p'))
+        self.assert_state(yes_action=['p'], no_action=[])
 
     def test_perform_bad_action(self):
         action = self.make_action('action', NoCondition())
         self.assert_state(action=[])
         self.assertFalse(action.check(None))
         self.assert_state(action=[])
-        self.assertRaises(ValueError, action.perform, 'p', 't')
+        self.assertRaises(ValueError, action.perform, 'p')
 
     def test_interactible_no_actions(self):
         interactible = environment.Interactible()