diff options
author | Johan Dahlin <johan@src.gnome.org> | 2005-07-22 16:15:10 +0000 |
---|---|---|
committer | Johan Dahlin <johan@src.gnome.org> | 2005-07-22 16:15:10 +0000 |
commit | b3322fc949bdbc28ce09aee1885fc312521eda2a (patch) | |
tree | 77ffbed9bf511e2b0e230480db96ef13ce996f9a | |
parent | 9070f26cbba93cd2c9e30710ece5101fe3495891 (diff) | |
download | pygtk-b3322fc949bdbc28ce09aee1885fc312521eda2a.tar.gz |
Re-enable
* tests/test_radiobutton.py (RadioToolButtonTest): Re-enable
* tests/test_dialog.py (MessageDialogTest.testSubclass): Add tests, for
#311226.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | tests/test_dialog.py | 15 | ||||
-rw-r--r-- | tests/test_radiobutton.py | 25 |
3 files changed, 31 insertions, 16 deletions
@@ -1,3 +1,10 @@ +2005-07-22 Johan Dahlin <jdahlin@async.com.br> + + * tests/test_radiobutton.py (RadioToolButtonTest): Re-enable + + * tests/test_dialog.py (MessageDialogTest.testSubclass): Add tests, for + #311226. + 2005-07-22 Gustavo J. A. M. Carneiro <gjc@gnome.org> * gobject/pygobject.c (pygobjectmeta_register): Don't diff --git a/tests/test_dialog.py b/tests/test_dialog.py index 74fadb76..7fc168d3 100644 --- a/tests/test_dialog.py +++ b/tests/test_dialog.py @@ -1,15 +1,24 @@ +import sys import unittest from common import gtk -class DialogTest(unittest.TestCase): +class MessageDialogTest(unittest.TestCase): def testDialogAdd(self): dialog = gtk.MessageDialog() - # sys.maxint + 1 - response_id = 2147483648 + response_id = sys.maxint + 1 self.assertRaises(OverflowError, dialog.add_button, "Foo", response_id) self.assertRaises(OverflowError, dialog.add_buttons, "Foo", response_id) + def testSubclass(self): + # Normal subclassing should not register a type + sub = type('sub', (gtk.MessageDialog,), {}) + self.assertEqual(sub.__gtype__.name, 'GtkMessageDialog') + + # This depends on 311254 + #type('Sub', (gtk.MessageDialog,), {'__gtype_name__': 'SubDialog'}) + #self.assertEqual(sub.__gtype__.name, 'SubDialog') + if __name__ == '__main__': unittest.main() diff --git a/tests/test_radiobutton.py b/tests/test_radiobutton.py index cf639588..98d86dd6 100644 --- a/tests/test_radiobutton.py +++ b/tests/test_radiobutton.py @@ -71,21 +71,20 @@ class RadioActionTest(RadioTest): def newLabel(self, label): return gtk.RadioAction('RadioAction', label, '', '', 0) -# Depends on bug 309836 -# class RadioToolButtonTest(RadioTest): -# widget_type = gtk.RadioToolButton +class RadioToolButtonTest(RadioTest): + widget_type = gtk.RadioToolButton -# def compareGroups(self, group1, group2): -# # GtkRadioToolButton.set/get_groups return GtkRadioButtons, -# # so instead of doing a normal cmp, compare ids -# return cmp(map(id, group1), map(id, group2)) + def compareGroups(self, group1, group2): + # GtkRadioToolButton.set/get_groups return GtkRadioButtons, + # so instead of doing a normal cmp, compare ids + return cmp(map(id, group1), map(id, group2)) -# def newLabel(self, label): -# # We don't have a constructor for which we can pass in a label -# # for, so just call set_label instead -# radio = gtk.RadioToolButton(None) -# radio.set_label(label) -# return radio + def newLabel(self, label): + # We don't have a constructor for which we can pass in a label + # for, so just call set_label instead + radio = gtk.RadioToolButton(None) + radio.set_label(label) + return radio class RadioMenuItem(RadioTest): widget_type = gtk.RadioMenuItem |