[pygobject] tests: Move test_gi.TestPropertiesObject into test_properties
- From: Simon Feltman <sfeltman src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] tests: Move test_gi.TestPropertiesObject into test_properties
- Date: Tue, 29 Jul 2014 07:00:40 +0000 (UTC)
commit bf0a5c3345e65b6a7475fada4ea240dbe0049a26
Author: Simon Feltman <sfeltman src gnome org>
Date: Mon Jul 28 19:32:00 2014 -0700
tests: Move test_gi.TestPropertiesObject into test_properties
Move all property testing code into the test_properties module.
https://bugzilla.gnome.org/show_bug.cgi?id=726999
tests/test_gi.py | 233 ---------------------------------------------
tests/test_properties.py | 235 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 235 insertions(+), 233 deletions(-)
---
diff --git a/tests/test_gi.py b/tests/test_gi.py
index 4a5d510..edd8ca0 100644
--- a/tests/test_gi.py
+++ b/tests/test_gi.py
@@ -2661,239 +2661,6 @@ class TestKeywordArgs(unittest.TestCase):
1, c='3')
-class TestPropertiesObject(unittest.TestCase):
-
- def setUp(self):
- self.obj = GIMarshallingTests.PropertiesObject()
-
- def test_boolean(self):
- self.assertEqual(self.obj.props.some_boolean, False)
- self.obj.props.some_boolean = True
- self.assertEqual(self.obj.props.some_boolean, True)
-
- obj = GIMarshallingTests.PropertiesObject(some_boolean=True)
- self.assertEqual(obj.props.some_boolean, True)
-
- def test_char(self):
- self.assertEqual(self.obj.props.some_char, 0)
- self.obj.props.some_char = GObject.G_MAXINT8
- self.assertEqual(self.obj.props.some_char, GObject.G_MAXINT8)
-
- obj = GIMarshallingTests.PropertiesObject(some_char=-42)
- self.assertEqual(obj.props.some_char, -42)
-
- def test_uchar(self):
- self.assertEqual(self.obj.props.some_uchar, 0)
- self.obj.props.some_uchar = GObject.G_MAXUINT8
- self.assertEqual(self.obj.props.some_uchar, GObject.G_MAXUINT8)
-
- obj = GIMarshallingTests.PropertiesObject(some_uchar=42)
- self.assertEqual(obj.props.some_uchar, 42)
-
- def test_int(self):
- self.assertEqual(self.obj.props.some_int, 0)
- self.obj.props.some_int = GObject.G_MAXINT
- self.assertEqual(self.obj.props.some_int, GObject.G_MAXINT)
-
- obj = GIMarshallingTests.PropertiesObject(some_int=-42)
- self.assertEqual(obj.props.some_int, -42)
-
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_int', 'foo')
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_int', None)
-
- self.assertEqual(obj.props.some_int, -42)
-
- def test_uint(self):
- self.assertEqual(self.obj.props.some_uint, 0)
- self.obj.props.some_uint = GObject.G_MAXUINT
- self.assertEqual(self.obj.props.some_uint, GObject.G_MAXUINT)
-
- obj = GIMarshallingTests.PropertiesObject(some_uint=42)
- self.assertEqual(obj.props.some_uint, 42)
-
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_uint', 'foo')
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_uint', None)
-
- self.assertEqual(obj.props.some_uint, 42)
-
- def test_long(self):
- self.assertEqual(self.obj.props.some_long, 0)
- self.obj.props.some_long = GObject.G_MAXLONG
- self.assertEqual(self.obj.props.some_long, GObject.G_MAXLONG)
-
- obj = GIMarshallingTests.PropertiesObject(some_long=-42)
- self.assertEqual(obj.props.some_long, -42)
-
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_long', 'foo')
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_long', None)
-
- self.assertEqual(obj.props.some_long, -42)
-
- def test_ulong(self):
- self.assertEqual(self.obj.props.some_ulong, 0)
- self.obj.props.some_ulong = GObject.G_MAXULONG
- self.assertEqual(self.obj.props.some_ulong, GObject.G_MAXULONG)
-
- obj = GIMarshallingTests.PropertiesObject(some_ulong=42)
- self.assertEqual(obj.props.some_ulong, 42)
-
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_ulong', 'foo')
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_ulong', None)
-
- self.assertEqual(obj.props.some_ulong, 42)
-
- def test_int64(self):
- self.assertEqual(self.obj.props.some_int64, 0)
- self.obj.props.some_int64 = GObject.G_MAXINT64
- self.assertEqual(self.obj.props.some_int64, GObject.G_MAXINT64)
-
- obj = GIMarshallingTests.PropertiesObject(some_int64=-4200000000000000)
- self.assertEqual(obj.props.some_int64, -4200000000000000)
-
- def test_uint64(self):
- self.assertEqual(self.obj.props.some_uint64, 0)
- self.obj.props.some_uint64 = GObject.G_MAXUINT64
- self.assertEqual(self.obj.props.some_uint64, GObject.G_MAXUINT64)
-
- obj = GIMarshallingTests.PropertiesObject(some_uint64=4200000000000000)
- self.assertEqual(obj.props.some_uint64, 4200000000000000)
-
- def test_float(self):
- self.assertEqual(self.obj.props.some_float, 0)
- self.obj.props.some_float = GObject.G_MAXFLOAT
- self.assertEqual(self.obj.props.some_float, GObject.G_MAXFLOAT)
-
- obj = GIMarshallingTests.PropertiesObject(some_float=42.42)
- self.assertAlmostEqual(obj.props.some_float, 42.42, 4)
-
- obj = GIMarshallingTests.PropertiesObject(some_float=42)
- self.assertAlmostEqual(obj.props.some_float, 42.0, 4)
-
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_float', 'foo')
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_float', None)
-
- self.assertAlmostEqual(obj.props.some_float, 42.0, 4)
-
- def test_double(self):
- self.assertEqual(self.obj.props.some_double, 0)
- self.obj.props.some_double = GObject.G_MAXDOUBLE
- self.assertEqual(self.obj.props.some_double, GObject.G_MAXDOUBLE)
-
- obj = GIMarshallingTests.PropertiesObject(some_double=42.42)
- self.assertAlmostEqual(obj.props.some_double, 42.42)
-
- obj = GIMarshallingTests.PropertiesObject(some_double=42)
- self.assertAlmostEqual(obj.props.some_double, 42.0)
-
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_double', 'foo')
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_double', None)
-
- self.assertAlmostEqual(obj.props.some_double, 42.0)
-
- def test_strv(self):
- self.assertEqual(self.obj.props.some_strv, [])
- self.obj.props.some_strv = ['hello', 'world']
- self.assertEqual(self.obj.props.some_strv, ['hello', 'world'])
-
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_strv', 1)
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_strv', 'foo')
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_strv', [1, 2])
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_strv', ['foo', 1])
-
- self.assertEqual(self.obj.props.some_strv, ['hello', 'world'])
-
- obj = GIMarshallingTests.PropertiesObject(some_strv=['hello', 'world'])
- self.assertEqual(obj.props.some_strv, ['hello', 'world'])
-
- def test_boxed_struct(self):
- self.assertEqual(self.obj.props.some_boxed_struct, None)
-
- class GStrv(list):
- __gtype__ = GObject.TYPE_STRV
-
- struct1 = GIMarshallingTests.BoxedStruct()
- struct1.long_ = 1
-
- self.obj.props.some_boxed_struct = struct1
- self.assertEqual(self.obj.props.some_boxed_struct.long_, 1)
- self.assertEqual(self.obj.some_boxed_struct.long_, 1)
-
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_boxed_struct', 1)
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_boxed_struct', 'foo')
-
- obj = GIMarshallingTests.PropertiesObject(some_boxed_struct=struct1)
- self.assertEqual(obj.props.some_boxed_struct.long_, 1)
-
- def test_boxed_glist(self):
- self.assertEqual(self.obj.props.some_boxed_glist, [])
-
- l = [GObject.G_MININT, 42, GObject.G_MAXINT]
- self.obj.props.some_boxed_glist = l
- self.assertEqual(self.obj.props.some_boxed_glist, l)
- self.obj.props.some_boxed_glist = []
- self.assertEqual(self.obj.props.some_boxed_glist, [])
-
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_boxed_glist', 1)
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_boxed_glist', 'foo')
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_boxed_glist', ['a'])
-
- @unittest.expectedFailure
- def test_boxed_glist_ctor(self):
- l = [GObject.G_MININT, 42, GObject.G_MAXINT]
- obj = GIMarshallingTests.PropertiesObject(some_boxed_glist=l)
- self.assertEqual(obj.props.some_boxed_glist, l)
-
- def test_variant(self):
- self.assertEqual(self.obj.props.some_variant, None)
-
- self.obj.props.some_variant = GLib.Variant('o', '/myobj')
- self.assertEqual(self.obj.props.some_variant.get_type_string(), 'o')
- self.assertEqual(self.obj.props.some_variant.print_(False), "'/myobj'")
-
- self.obj.props.some_variant = None
- self.assertEqual(self.obj.props.some_variant, None)
-
- obj = GIMarshallingTests.PropertiesObject(some_variant=GLib.Variant('b', True))
- self.assertEqual(obj.props.some_variant.get_type_string(), 'b')
- self.assertEqual(obj.props.some_variant.get_boolean(), True)
-
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_variant', 'foo')
- self.assertRaises(TypeError, setattr, self.obj.props, 'some_variant', 23)
-
- self.assertEqual(obj.props.some_variant.get_type_string(), 'b')
- self.assertEqual(obj.props.some_variant.get_boolean(), True)
-
- def test_setting_several_properties(self):
- obj = GIMarshallingTests.PropertiesObject()
- obj.set_properties(some_uchar=54, some_int=42)
- self.assertEqual(42, obj.props.some_int)
- self.assertEqual(54, obj.props.some_uchar)
-
- def test_props_accessor_dir(self):
- # Test class
- props = dir(GIMarshallingTests.PropertiesObject.props)
- self.assertTrue('some_float' in props)
- self.assertTrue('some_double' in props)
- self.assertTrue('some_variant' in props)
-
- # Test instance
- obj = GIMarshallingTests.PropertiesObject()
- props = dir(obj.props)
- self.assertTrue('some_float' in props)
- self.assertTrue('some_double' in props)
- self.assertTrue('some_variant' in props)
-
- def test_param_spec_dir(self):
- attrs = dir(GIMarshallingTests.PropertiesObject.props.some_float)
- self.assertTrue('name' in attrs)
- self.assertTrue('nick' in attrs)
- self.assertTrue('blurb' in attrs)
- self.assertTrue('flags' in attrs)
- self.assertTrue('default_value' in attrs)
- self.assertTrue('minimum' in attrs)
- self.assertTrue('maximum' in attrs)
-
-
class TestKeywords(unittest.TestCase):
def test_method(self):
# g_variant_print()
diff --git a/tests/test_properties.py b/tests/test_properties.py
index c0579f7..30ab28b 100644
--- a/tests/test_properties.py
+++ b/tests/test_properties.py
@@ -925,5 +925,240 @@ class TestInstallProperties(unittest.TestCase):
self.assertRaises(ValueError, propertyhelper.install_properties,
self.ClassWithPropertyRedefined)
+
+class TestPropertiesObject(unittest.TestCase):
+ # Tests for properties implemented in C not Python.
+
+ def setUp(self):
+ self.obj = GIMarshallingTests.PropertiesObject()
+
+ def test_boolean(self):
+ self.assertEqual(self.obj.props.some_boolean, False)
+ self.obj.props.some_boolean = True
+ self.assertEqual(self.obj.props.some_boolean, True)
+
+ obj = GIMarshallingTests.PropertiesObject(some_boolean=True)
+ self.assertEqual(obj.props.some_boolean, True)
+
+ def test_char(self):
+ self.assertEqual(self.obj.props.some_char, 0)
+ self.obj.props.some_char = GObject.G_MAXINT8
+ self.assertEqual(self.obj.props.some_char, GObject.G_MAXINT8)
+
+ obj = GIMarshallingTests.PropertiesObject(some_char=-42)
+ self.assertEqual(obj.props.some_char, -42)
+
+ def test_uchar(self):
+ self.assertEqual(self.obj.props.some_uchar, 0)
+ self.obj.props.some_uchar = GObject.G_MAXUINT8
+ self.assertEqual(self.obj.props.some_uchar, GObject.G_MAXUINT8)
+
+ obj = GIMarshallingTests.PropertiesObject(some_uchar=42)
+ self.assertEqual(obj.props.some_uchar, 42)
+
+ def test_int(self):
+ self.assertEqual(self.obj.props.some_int, 0)
+ self.obj.props.some_int = GObject.G_MAXINT
+ self.assertEqual(self.obj.props.some_int, GObject.G_MAXINT)
+
+ obj = GIMarshallingTests.PropertiesObject(some_int=-42)
+ self.assertEqual(obj.props.some_int, -42)
+
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_int', 'foo')
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_int', None)
+
+ self.assertEqual(obj.props.some_int, -42)
+
+ def test_uint(self):
+ self.assertEqual(self.obj.props.some_uint, 0)
+ self.obj.props.some_uint = GObject.G_MAXUINT
+ self.assertEqual(self.obj.props.some_uint, GObject.G_MAXUINT)
+
+ obj = GIMarshallingTests.PropertiesObject(some_uint=42)
+ self.assertEqual(obj.props.some_uint, 42)
+
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_uint', 'foo')
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_uint', None)
+
+ self.assertEqual(obj.props.some_uint, 42)
+
+ def test_long(self):
+ self.assertEqual(self.obj.props.some_long, 0)
+ self.obj.props.some_long = GObject.G_MAXLONG
+ self.assertEqual(self.obj.props.some_long, GObject.G_MAXLONG)
+
+ obj = GIMarshallingTests.PropertiesObject(some_long=-42)
+ self.assertEqual(obj.props.some_long, -42)
+
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_long', 'foo')
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_long', None)
+
+ self.assertEqual(obj.props.some_long, -42)
+
+ def test_ulong(self):
+ self.assertEqual(self.obj.props.some_ulong, 0)
+ self.obj.props.some_ulong = GObject.G_MAXULONG
+ self.assertEqual(self.obj.props.some_ulong, GObject.G_MAXULONG)
+
+ obj = GIMarshallingTests.PropertiesObject(some_ulong=42)
+ self.assertEqual(obj.props.some_ulong, 42)
+
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_ulong', 'foo')
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_ulong', None)
+
+ self.assertEqual(obj.props.some_ulong, 42)
+
+ def test_int64(self):
+ self.assertEqual(self.obj.props.some_int64, 0)
+ self.obj.props.some_int64 = GObject.G_MAXINT64
+ self.assertEqual(self.obj.props.some_int64, GObject.G_MAXINT64)
+
+ obj = GIMarshallingTests.PropertiesObject(some_int64=-4200000000000000)
+ self.assertEqual(obj.props.some_int64, -4200000000000000)
+
+ def test_uint64(self):
+ self.assertEqual(self.obj.props.some_uint64, 0)
+ self.obj.props.some_uint64 = GObject.G_MAXUINT64
+ self.assertEqual(self.obj.props.some_uint64, GObject.G_MAXUINT64)
+
+ obj = GIMarshallingTests.PropertiesObject(some_uint64=4200000000000000)
+ self.assertEqual(obj.props.some_uint64, 4200000000000000)
+
+ def test_float(self):
+ self.assertEqual(self.obj.props.some_float, 0)
+ self.obj.props.some_float = GObject.G_MAXFLOAT
+ self.assertEqual(self.obj.props.some_float, GObject.G_MAXFLOAT)
+
+ obj = GIMarshallingTests.PropertiesObject(some_float=42.42)
+ self.assertAlmostEqual(obj.props.some_float, 42.42, 4)
+
+ obj = GIMarshallingTests.PropertiesObject(some_float=42)
+ self.assertAlmostEqual(obj.props.some_float, 42.0, 4)
+
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_float', 'foo')
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_float', None)
+
+ self.assertAlmostEqual(obj.props.some_float, 42.0, 4)
+
+ def test_double(self):
+ self.assertEqual(self.obj.props.some_double, 0)
+ self.obj.props.some_double = GObject.G_MAXDOUBLE
+ self.assertEqual(self.obj.props.some_double, GObject.G_MAXDOUBLE)
+
+ obj = GIMarshallingTests.PropertiesObject(some_double=42.42)
+ self.assertAlmostEqual(obj.props.some_double, 42.42)
+
+ obj = GIMarshallingTests.PropertiesObject(some_double=42)
+ self.assertAlmostEqual(obj.props.some_double, 42.0)
+
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_double', 'foo')
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_double', None)
+
+ self.assertAlmostEqual(obj.props.some_double, 42.0)
+
+ def test_strv(self):
+ self.assertEqual(self.obj.props.some_strv, [])
+ self.obj.props.some_strv = ['hello', 'world']
+ self.assertEqual(self.obj.props.some_strv, ['hello', 'world'])
+
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_strv', 1)
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_strv', 'foo')
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_strv', [1, 2])
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_strv', ['foo', 1])
+
+ self.assertEqual(self.obj.props.some_strv, ['hello', 'world'])
+
+ obj = GIMarshallingTests.PropertiesObject(some_strv=['hello', 'world'])
+ self.assertEqual(obj.props.some_strv, ['hello', 'world'])
+
+ def test_boxed_struct(self):
+ self.assertEqual(self.obj.props.some_boxed_struct, None)
+
+ class GStrv(list):
+ __gtype__ = GObject.TYPE_STRV
+
+ struct1 = GIMarshallingTests.BoxedStruct()
+ struct1.long_ = 1
+
+ self.obj.props.some_boxed_struct = struct1
+ self.assertEqual(self.obj.props.some_boxed_struct.long_, 1)
+ self.assertEqual(self.obj.some_boxed_struct.long_, 1)
+
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_boxed_struct', 1)
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_boxed_struct', 'foo')
+
+ obj = GIMarshallingTests.PropertiesObject(some_boxed_struct=struct1)
+ self.assertEqual(obj.props.some_boxed_struct.long_, 1)
+
+ def test_boxed_glist(self):
+ self.assertEqual(self.obj.props.some_boxed_glist, [])
+
+ l = [GObject.G_MININT, 42, GObject.G_MAXINT]
+ self.obj.props.some_boxed_glist = l
+ self.assertEqual(self.obj.props.some_boxed_glist, l)
+ self.obj.props.some_boxed_glist = []
+ self.assertEqual(self.obj.props.some_boxed_glist, [])
+
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_boxed_glist', 1)
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_boxed_glist', 'foo')
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_boxed_glist', ['a'])
+
+ @unittest.expectedFailure
+ def test_boxed_glist_ctor(self):
+ l = [GObject.G_MININT, 42, GObject.G_MAXINT]
+ obj = GIMarshallingTests.PropertiesObject(some_boxed_glist=l)
+ self.assertEqual(obj.props.some_boxed_glist, l)
+
+ def test_variant(self):
+ self.assertEqual(self.obj.props.some_variant, None)
+
+ self.obj.props.some_variant = GLib.Variant('o', '/myobj')
+ self.assertEqual(self.obj.props.some_variant.get_type_string(), 'o')
+ self.assertEqual(self.obj.props.some_variant.print_(False), "'/myobj'")
+
+ self.obj.props.some_variant = None
+ self.assertEqual(self.obj.props.some_variant, None)
+
+ obj = GIMarshallingTests.PropertiesObject(some_variant=GLib.Variant('b', True))
+ self.assertEqual(obj.props.some_variant.get_type_string(), 'b')
+ self.assertEqual(obj.props.some_variant.get_boolean(), True)
+
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_variant', 'foo')
+ self.assertRaises(TypeError, setattr, self.obj.props, 'some_variant', 23)
+
+ self.assertEqual(obj.props.some_variant.get_type_string(), 'b')
+ self.assertEqual(obj.props.some_variant.get_boolean(), True)
+
+ def test_setting_several_properties(self):
+ obj = GIMarshallingTests.PropertiesObject()
+ obj.set_properties(some_uchar=54, some_int=42)
+ self.assertEqual(42, obj.props.some_int)
+ self.assertEqual(54, obj.props.some_uchar)
+
+ def test_props_accessor_dir(self):
+ # Test class
+ props = dir(GIMarshallingTests.PropertiesObject.props)
+ self.assertTrue('some_float' in props)
+ self.assertTrue('some_double' in props)
+ self.assertTrue('some_variant' in props)
+
+ # Test instance
+ obj = GIMarshallingTests.PropertiesObject()
+ props = dir(obj.props)
+ self.assertTrue('some_float' in props)
+ self.assertTrue('some_double' in props)
+ self.assertTrue('some_variant' in props)
+
+ def test_param_spec_dir(self):
+ attrs = dir(GIMarshallingTests.PropertiesObject.props.some_float)
+ self.assertTrue('name' in attrs)
+ self.assertTrue('nick' in attrs)
+ self.assertTrue('blurb' in attrs)
+ self.assertTrue('flags' in attrs)
+ self.assertTrue('default_value' in attrs)
+ self.assertTrue('minimum' in attrs)
+ self.assertTrue('maximum' in attrs)
+
+
if __name__ == '__main__':
unittest.main()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]