From 9fafb49af210e956d43d6a00106558d1a00d13df Mon Sep 17 00:00:00 2001
From: Simon Poirier <simpoir@gmail.com>
Date: Thu, 02 Jul 2009 05:27:27 +0000
Subject: * Modularized actions and event filters through add-on components

* Working serialization
* Working editor with addons
* began refactoring actions and events
** fixed some tests to work with addons
** filters and actions tests won't pass until refactoring is done
---
(limited to 'src/sugar/tutorius/tests/actiontests.py')

diff --git a/src/sugar/tutorius/tests/actiontests.py b/src/sugar/tutorius/tests/actiontests.py
index d244547..4e126b3 100644
--- a/src/sugar/tutorius/tests/actiontests.py
+++ b/src/sugar/tutorius/tests/actiontests.py
@@ -24,17 +24,18 @@ The behavior of the actions must be tested here.
 import unittest
 import gtk
 
+from sugar.tutorius import addon
 from sugar.tutorius.actions import *
 from sugar.tutorius.services import ObjectStore
 
 test_props = {"prop_a":8, "prop_b":3, "prop_c":"Hi"}
 
 class PropertyAction(Action):
+    prop_a = TIntProperty(test_props["prop_a"])
+    prop_b = TIntProperty(test_props["prop_b"])
+    prop_c = TStringProperty(test_props["prop_c"])
     def __init__(self, na):
         Action.__init__(self)
-        self.prop_a = TIntProperty(test_props["prop_a"])
-        self.prop_b = TIntProperty(test_props["prop_b"])
-        self.prop_c = TStringProperty(test_props["prop_c"])
 
 def has_function(obj, function_name):
         """
@@ -51,20 +52,20 @@ class PropsTest(unittest.TestCase):
         assert act.get_properties() == test_props.keys(), "Action does not contain property 'a'"
         
         for prop_name in act.get_properties():
-            assert act.properties[prop_name].value == test_props[prop_name], "Wrong initial value for property %s : %s"%(prop_name,str(act.properties[prop_name]))
+            assert getattr(act, prop_name) == test_props[prop_name], "Wrong initial value for property %s : %s"%(prop_name,str(getattr(act, prop_name)))
 
 class DialogMessageTest(unittest.TestCase):
     def setUp(self):
-        self.dial = DialogMessage("Message text", [200, 300])
+        self.dial = addon.create('DialogMessage', "Message text", [200, 300])
     
     def test_properties(self):
-        assert self.dial.message.value == "Message text", "Wrong start value for the message"
+        assert self.dial.message == "Message text", "Wrong start value for the message"
         
-        assert self.dial.position.value == [200, 300], "Wrong start value for the position"
+        assert self.dial.position == [200, 300], "Wrong start value for the position"
     
 class BubbleMessageTest(unittest.TestCase):
     def setUp(self):
-        self.bubble = BubbleMessage(message="Message text", pos=[200, 300], tailpos=[-15, -25])
+        self.bubble = addon.create('BubbleMessage', message="Message text", pos=[200, 300], tailpos=[-15, -25])
         
     def test_properties(self):
         props = self.bubble.get_properties()
@@ -81,6 +82,7 @@ class CountAction(Action):
     This action counts how many times it's do and undo methods get called
     """
     def __init__(self):
+        Action.__init__(self)
         self.do_count = 0
         self.undo_count = 0
 
@@ -136,6 +138,7 @@ class OnceWrapperTests(unittest.TestCase):
 
 class ChainTester(Action):
     def __init__(self, witness):
+        Action.__init__(self)
         self._witness = witness
 
     def do(self, **kwargs):
--
cgit v0.9.1