pitivi r1248 - in trunk: . pitivi/ui tests

[blewis svn gnome org]

Author: blewis
Date: Fri Sep 12 00:42:19 2008
New Revision: 1248
URL: http://svn.gnome.org/viewvc/pitivi?rev=1248&view=rev

Log:
* pitivi/ui/util.py:
* tests/test_proxy.py:
fix test suite and ProxyItem class, so that test cases actually pass


Modified:
   trunk/ChangeLog
   trunk/pitivi/ui/util.py
   trunk/tests/test_proxy.py

Modified: trunk/pitivi/ui/util.py
==============================================================================
--- trunk/pitivi/ui/util.py	(original)
+++ trunk/pitivi/ui/util.py	Fri Sep 12 00:42:19 2008
@@ -390,11 +390,11 @@
         'height' : FLT_PSPEC,
     }
 
-    def do_get_property(self, pspec, value):
+    def do_get_property(self, pspec):
         """Returns the value of the corresponding delegate property,
         or 0 if there is no property"""
         if self.delegate:
-            return self.delegate.props[pspec.name]
+            return self.delegate.get_property(pspec.name)
         return 0
 
     def do_set_property(self, pspec, value):
@@ -404,12 +404,13 @@
         delegate, if it exists."""
         if pspec.name in self.functions:
             self.functions[pspec.name](value)
-        self.set_delegate(pspec.name, value)
+        else:
+            self.set_delegate_property(pspec.name, value)
 
     def set_delegate_property(self, property, value):
-        """Sets the corresponding property in the delagate, if it exists."""
+        """Sets the corresponding property in the delegate, if it exists."""
         if self.delegate:
-            self.delegate.props[property] = value
+            self.delegate.set_property(property, value)
 
     def set_delegate(self, delegate):
         """Sets the UI object for which this object is acting as a proxy"""
@@ -419,12 +420,12 @@
         if delegate:
             self.add_child(delegate)
 
-    def __init__(self, delegate=None, **kwargs):
+    def __init__(self, delegate=None, *args, **kwargs):
         """Creates a proxy item with the specified delegate,
            and default property setters"""
-        super(ProxyItem, self).__init__(*args)
+        super(ProxyItem, self).__init__(*args, **kwargs)
         self.delegate = None
-        self.set_delegate(delagate)
+        self.set_delegate(delegate)
         self.functions = kwargs
 
     def set_property_handler(self, property, handler):

Modified: trunk/tests/test_proxy.py
==============================================================================
--- trunk/tests/test_proxy.py	(original)
+++ trunk/tests/test_proxy.py	Fri Sep 12 00:42:19 2008
@@ -9,40 +9,46 @@
     """
 
     def setUp(self):
-        self.r = goocanas.Rect()
-        self.p = ProxyItem(delegate=r)
+        self.r = goocanvas.Rect()
+        self.p = ProxyItem(delegate=self.r)
 
     def tearDown(self):
         self.r = None
         self.p = None
 
     def testDelegation(self):
-        self.p.set_delegate_property("x", 100)
-        self.p.set_delegate_property("y", 100)
-        self.assertEquals(r.x, p.x)
-        self.assertEquals(r.y, p.y)
-        self.assertEquals(r.x, 100)
-        self.assertEquals(r.y, 200)
+        self.p.set_delegate_property("x", 100.0)
+        self.p.set_delegate_property("y", 200.0)
+        self.assertEquals(self.r.props.x, self.p.props.x)
+        self.assertEquals(self.r.props.y, self.p.props.y)
+        self.assertEquals(self.r.props.x, 100.0)
+        self.assertEquals(self.r.props.y, 200.0)
 
     def testDefault(self):
         self.p.props.x = 100
         self.p.props.y = 200
-        self.assertEquals(r.x, p.x)
-        self.assertEquals(r.y, p.y)
-        self.assertEquals(r.x, 100)
-        self.assertEquals(r.y, 200)
+        self.assertEquals(self.r.props.x, self.p.props.x)
+        self.assertEquals(self.r.props.y, self.p.props.y)
+        self.assertEquals(self.r.props.x, 100.0)
+        self.assertEquals(self.r.props.y, 200.0)
 
     def testOverrides(self):
+        self.got_x = False
+        self.got_y = False
         def x_prop_handler(value):
-            self.assertEquals(value, 100)
+            self.got_x = True
+            self.assertEquals(value, 100.0)
         def y_prop_handler(value):
-            self.assertEquals(value, 200)
-        p.set_property_handler("x", x_prop_handler)
-        p.set_property_handler("y", y_prop_handler)
-        p.props.x = 100
-        p.prpos.y = 200
-        assertNotEqual(p.props.x, 100)
-        assertNotEqual(p.props.y, 200)
+            self.got_y = True
+            self.assertEquals(value, 200.0)
+        self.p.set_property_handler("x", x_prop_handler)
+        self.p.set_property_handler("y", y_prop_handler)
+        self.p.props.x = 100.0
+        self.p.props.y = 200.0
+        self.assertTrue(self.got_x)
+        self.assertTrue(self.got_y)
+        self.assertNotEqual(self.p.props.x, 100.0)
+        self.assertNotEqual(self.p.props.y, 200.0)
 
 if __name__ == "__main__":
     unittest.main()