diff options
| author | Johan Dahlin <johan@src.gnome.org> | 2004-08-06 15:56:53 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2004-08-06 15:56:53 +0000 |
| commit | bf6a98e9b90b99cbc12e84be278dddbf697087f1 (patch) | |
| tree | 66291ad6bec95a368f9cc2668d8f04ddf7b2ff4d /tests/enum.py | |
| parent | 8b75bb80e67b43202aa75f8ca075a21a11e9f574 (diff) | |
| download | pygobject-bf6a98e9b90b99cbc12e84be278dddbf697087f1.tar.gz pygobject-bf6a98e9b90b99cbc12e84be278dddbf697087f1.tar.xz pygobject-bf6a98e9b90b99cbc12e84be278dddbf697087f1.zip | |
Don't comment out the fallback, it break the test. (Wow, the testsuitePYGTK_2_3_96
* gobject/pygflags.c (pyg_flags_from_gtype): Don't comment out the
fallback, it break the test. (Wow, the testsuite caught another bug!)
* tests/enum.py: Additional tests.
* gobject/pygenum.c (pyg_enum_repr): Don't use g_enum_get_value,
use enum_class->values[n].value_name instead. Also check if the
value is NULL or not. This makes gtk.icon_size_register work a
little bit better.
Diffstat (limited to 'tests/enum.py')
| -rw-r--r-- | tests/enum.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/enum.py b/tests/enum.py index 2e2a2dc..052a5e9 100644 --- a/tests/enum.py +++ b/tests/enum.py @@ -73,8 +73,12 @@ class EnumTest(unittest.TestCase): assert len(klass.__enum_values__) >= 2 def testOutofBounds(self): - assert gtk.icon_size_register('fake', 24, 24) == 7 - + val = gtk.icon_size_register('fake', 24, 24) + assert isinstance(val, gobject.GEnum) + assert int(val) == 7 + assert '7' in repr(val) + assert 'GtkIconSize' in repr(val) + class FlagsTest(unittest.TestCase): def testFlags(self): assert issubclass(gobject.GFlags, int) @@ -100,16 +104,19 @@ class FlagsTest(unittest.TestCase): def testFlagOperations(self): a = gdk.BUTTON_PRESS_MASK + assert isinstance(a, gobject.GFlags) assert a.first_value_name == 'GDK_BUTTON_PRESS_MASK' assert a.first_value_nick == 'button-press-mask' assert a.value_names == ['GDK_BUTTON_PRESS_MASK'], a.value_names assert a.value_nicks == ['button-press-mask'], a.value_names b = gdk.BUTTON_PRESS_MASK | gdk.BUTTON_RELEASE_MASK + assert isinstance(b, gobject.GFlags) assert b.first_value_name == 'GDK_BUTTON_PRESS_MASK' assert b.first_value_nick == 'button-press-mask' assert b.value_names == ['GDK_BUTTON_PRESS_MASK', 'GDK_BUTTON_RELEASE_MASK'] assert b.value_nicks == ['button-press-mask', 'button-release-mask'] c = gdk.BUTTON_PRESS_MASK | gdk.BUTTON_RELEASE_MASK | gdk.ENTER_NOTIFY_MASK + assert isinstance(c, gobject.GFlags) assert c.first_value_name == 'GDK_BUTTON_PRESS_MASK' assert c.first_value_nick == 'button-press-mask' assert c.value_names == ['GDK_BUTTON_PRESS_MASK', 'GDK_BUTTON_RELEASE_MASK', |