[pygobject] tests: Replace deprecated Python API

[Martin Pitt <martinpitt src gnome org>]

commit c375e3136f0f48eb8a6717c0053155db088b329d
Author: Martin Pitt <martin pitt ubuntu com>
Date:   Thu Mar 22 10:32:43 2012 +0100

    tests: Replace deprecated Python API
    
    failIf â assertFalse, failUnless â assertTrue
    
    Caught by the previous commit of making deprecations fatal.

 tests/test_option.py      |   10 +++---
 tests/test_overrides.py   |   66 ++++++++++++++++++++++----------------------
 tests/test_properties.py  |   14 +++++-----
 tests/test_pygtkcompat.py |   18 ++++++------
 tests/test_signal.py      |    4 +-
 5 files changed, 56 insertions(+), 56 deletions(-)
---
diff --git a/tests/test_option.py b/tests/test_option.py
index 55f651d..2f7e703 100644
--- a/tests/test_option.py
+++ b/tests/test_option.py
@@ -59,7 +59,7 @@ class TestOption(unittest.TestCase):
     def testParseArgs(self):
         options, args = self.parser.parse_args(
             ["test_option.py"])
-        self.failIf(args)
+        self.assertFalse(args)
 
         options, args = self.parser.parse_args(
             ["test_option.py", "foo"])
@@ -80,13 +80,13 @@ class TestOption(unittest.TestCase):
         options, args = self.parser.parse_args(
             ["test_option.py", "--test", "-f", "test"])
 
-        self.failIf(options.test)
+        self.assertFalse(options.test)
         self.assertEqual(options.unit_file, "test")
 
-        self.failUnless(group.values.test)
-        self.failIf(self.parser.values.test)
+        self.assertTrue(group.values.test)
+        self.assertFalse(self.parser.values.test)
         self.assertEqual(group.values.unit_file, "test")
-        self.failIf(args)
+        self.assertFalse(args)
 
     def testOptionValueError(self):
         self._create_group()
diff --git a/tests/test_overrides.py b/tests/test_overrides.py
index 04d28de..68d6186 100644
--- a/tests/test_overrides.py
+++ b/tests/test_overrides.py
@@ -561,9 +561,9 @@ class TestGtk(unittest.TestCase):
 
     def test_container(self):
         box = Gtk.Box()
-        self.failUnless(isinstance(box, Gtk.Box))
-        self.failUnless(isinstance(box, Gtk.Container))
-        self.failUnless(isinstance(box, Gtk.Widget))
+        self.assertTrue(isinstance(box, Gtk.Box))
+        self.assertTrue(isinstance(box, Gtk.Container))
+        self.assertTrue(isinstance(box, Gtk.Widget))
         self.assertTrue(box)
         label = Gtk.Label()
         label2 = Gtk.Label()
@@ -742,8 +742,8 @@ class TestGtk(unittest.TestCase):
         dialog = Gtk.Dialog (title='Foo',
                              flags=Gtk.DialogFlags.MODAL,
                              buttons=('test-button1', 1))
-        self.failUnless(isinstance(dialog, Gtk.Dialog))
-        self.failUnless(isinstance(dialog, Gtk.Window))
+        self.assertTrue(isinstance(dialog, Gtk.Dialog))
+        self.assertTrue(isinstance(dialog, Gtk.Window))
 
         dialog.add_buttons ('test-button2', 2, Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE)
 
@@ -758,16 +758,16 @@ class TestGtk(unittest.TestCase):
 
         # Gtk.AboutDialog
         dialog = Gtk.AboutDialog()
-        self.failUnless(isinstance(dialog, Gtk.Dialog))
-        self.failUnless(isinstance(dialog, Gtk.Window))
+        self.assertTrue(isinstance(dialog, Gtk.Dialog))
+        self.assertTrue(isinstance(dialog, Gtk.Window))
 
         # Gtk.MessageDialog
         dialog = Gtk.MessageDialog (title='message dialog test',
                                     flags=Gtk.DialogFlags.MODAL,
                                     buttons=Gtk.ButtonsType.OK,
                                     message_format='dude!')
-        self.failUnless(isinstance(dialog, Gtk.Dialog))
-        self.failUnless(isinstance(dialog, Gtk.Window))
+        self.assertTrue(isinstance(dialog, Gtk.Dialog))
+        self.assertTrue(isinstance(dialog, Gtk.Window))
 
         self.assertEquals('message dialog test', dialog.get_title())
         self.assertTrue(dialog.get_modal())
@@ -784,16 +784,16 @@ class TestGtk(unittest.TestCase):
 
         # Gtk.ColorSelectionDialog
         dialog = Gtk.ColorSelectionDialog("color selection dialog test")
-        self.failUnless(isinstance(dialog, Gtk.Dialog))
-        self.failUnless(isinstance(dialog, Gtk.Window))
+        self.assertTrue(isinstance(dialog, Gtk.Dialog))
+        self.assertTrue(isinstance(dialog, Gtk.Window))
         self.assertEquals('color selection dialog test', dialog.get_title())
 
         # Gtk.FileChooserDialog
         dialog = Gtk.FileChooserDialog (title='file chooser dialog test',
                                         buttons=('test-button1', 1),
                                         action=Gtk.FileChooserAction.SAVE)
-        self.failUnless(isinstance(dialog, Gtk.Dialog))
-        self.failUnless(isinstance(dialog, Gtk.Window))
+        self.assertTrue(isinstance(dialog, Gtk.Dialog))
+        self.assertTrue(isinstance(dialog, Gtk.Window))
 
         dialog.add_buttons ('test-button2', 2, Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE)
         self.assertEquals('file chooser dialog test', dialog.get_title())
@@ -809,8 +809,8 @@ class TestGtk(unittest.TestCase):
 
         # Gtk.FontSelectionDialog
         dialog = Gtk.ColorSelectionDialog("font selection dialog test")
-        self.failUnless(isinstance(dialog, Gtk.Dialog))
-        self.failUnless(isinstance(dialog, Gtk.Window))
+        self.assertTrue(isinstance(dialog, Gtk.Dialog))
+        self.assertTrue(isinstance(dialog, Gtk.Window))
         self.assertEquals('font selection dialog test', dialog.get_title())
 
         # Gtk.RecentChooserDialog
@@ -818,8 +818,8 @@ class TestGtk(unittest.TestCase):
         dialog = Gtk.RecentChooserDialog (title='recent chooser dialog test',
                                           buttons=('test-button1', 1),
                                           manager=test_manager)
-        self.failUnless(isinstance(dialog, Gtk.Dialog))
-        self.failUnless(isinstance(dialog, Gtk.Window))
+        self.assertTrue(isinstance(dialog, Gtk.Dialog))
+        self.assertTrue(isinstance(dialog, Gtk.Window))
 
         dialog.add_buttons ('test-button2', 2, Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE)
         self.assertEquals('recent chooser dialog test', dialog.get_title())
@@ -1641,9 +1641,9 @@ class TestGtk(unittest.TestCase):
 
         # test Gtk.Button
         button = Gtk.Button()
-        self.failUnless(isinstance(button, Gtk.Button))
-        self.failUnless(isinstance(button, Gtk.Container))
-        self.failUnless(isinstance(button, Gtk.Widget))
+        self.assertTrue(isinstance(button, Gtk.Button))
+        self.assertTrue(isinstance(button, Gtk.Container))
+        self.assertTrue(isinstance(button, Gtk.Widget))
         button = Gtk.Button(stock=Gtk.STOCK_CLOSE)
         self.assertEquals(Gtk.STOCK_CLOSE, button.get_label())
         self.assertTrue(button.get_use_stock())
@@ -1658,9 +1658,9 @@ class TestGtk(unittest.TestCase):
         # test Gtk.LinkButton
         self.assertRaises(TypeError, Gtk.LinkButton)
         button = Gtk.LinkButton('http://www.Gtk.org', 'Gtk')
-        self.failUnless(isinstance(button, Gtk.Button))
-        self.failUnless(isinstance(button, Gtk.Container))
-        self.failUnless(isinstance(button, Gtk.Widget))
+        self.assertTrue(isinstance(button, Gtk.Button))
+        self.assertTrue(isinstance(button, Gtk.Container))
+        self.assertTrue(isinstance(button, Gtk.Widget))
         self.assertEquals('http://www.Gtk.org', button.get_uri())
         self.assertEquals('Gtk', button.get_label())
 
@@ -1704,7 +1704,7 @@ class TestGtk(unittest.TestCase):
 
     def test_label(self):
         label = Gtk.Label(label='Hello')
-        self.failUnless(isinstance(label, Gtk.Widget))
+        self.assertTrue(isinstance(label, Gtk.Widget))
         self.assertEquals(label.get_text(), 'Hello')
 
     def adjustment_check(self, adjustment, value=0.0, lower=0.0, upper=0.0,
@@ -1738,9 +1738,9 @@ class TestGtk(unittest.TestCase):
 
     def test_table(self):
         table = Gtk.Table()
-        self.failUnless(isinstance(table, Gtk.Table))
-        self.failUnless(isinstance(table, Gtk.Container))
-        self.failUnless(isinstance(table, Gtk.Widget))
+        self.assertTrue(isinstance(table, Gtk.Table))
+        self.assertTrue(isinstance(table, Gtk.Container))
+        self.assertTrue(isinstance(table, Gtk.Widget))
         self.assertEquals(table.get_size(), (1,1))
         self.assertEquals(table.get_homogeneous(), False)
         table = Gtk.Table(2, 3)
@@ -1759,15 +1759,15 @@ class TestGtk(unittest.TestCase):
         self.assertEquals(table.get_homogeneous(), True)
 
         label = Gtk.Label(label='Hello')
-        self.failUnless(isinstance(label, Gtk.Widget))
+        self.assertTrue(isinstance(label, Gtk.Widget))
         table.attach(label, 0, 1, 0, 1)
         self.assertEquals(label, table.get_children()[0])
 
     def test_scrolledwindow(self):
         sw = Gtk.ScrolledWindow()
-        self.failUnless(isinstance(sw, Gtk.ScrolledWindow))
-        self.failUnless(isinstance(sw, Gtk.Container))
-        self.failUnless(isinstance(sw, Gtk.Widget))
+        self.assertTrue(isinstance(sw, Gtk.ScrolledWindow))
+        self.assertTrue(isinstance(sw, Gtk.Container))
+        self.assertTrue(isinstance(sw, Gtk.Widget))
         sb = sw.get_hscrollbar()
         self.assertEquals(sw.get_hadjustment(), sb.get_adjustment())
         sb = sw.get_vscrollbar()
@@ -1926,8 +1926,8 @@ class TestGio(unittest.TestCase):
         self.assertEqual(len(self.settings), 4)
         self.assertTrue('test-array' in self.settings)
         self.assertTrue('test-array' in self.settings.keys())
-        self.failIf('nonexisting' in self.settings)
-        self.failIf(4 in self.settings)
+        self.assertFalse('nonexisting' in self.settings)
+        self.assertFalse(4 in self.settings)
         self.assertEqual(bool(self.settings), True)
 
         # get various types
diff --git a/tests/test_properties.py b/tests/test_properties.py
index 200fd96..b132a66 100644
--- a/tests/test_properties.py
+++ b/tests/test_properties.py
@@ -51,10 +51,10 @@ class TestProperties(unittest.TestCase):
 
     def testListWithInstance(self):
         obj = PropertyObject()
-        self.failUnless(hasattr(obj.props, "normal"))
+        self.assertTrue(hasattr(obj.props, "normal"))
 
     def testListWithoutInstance(self):
-        self.failUnless(hasattr(PropertyObject.props, "normal"))
+        self.assertTrue(hasattr(PropertyObject.props, "normal"))
 
     def testSetNoInstance(self):
         def set(obj):
@@ -67,7 +67,7 @@ class TestProperties(unittest.TestCase):
             for pspec in obj:
                 gtype = GType(pspec)
                 self.assertEqual(gtype.parent.name, 'GParam')
-                self.failUnless(pspec.name in ['normal',
+                self.assertTrue(pspec.name in ['normal',
                                                'construct',
                                                'construct-only',
                                                'uint64',
@@ -262,10 +262,10 @@ class TestProperty(unittest.TestCase):
             float = GObject.Property(type=float)
             long = GObject.Property(type=_long)
 
-        self.failUnless(hasattr(C.props, 'str'))
-        self.failUnless(hasattr(C.props, 'int'))
-        self.failUnless(hasattr(C.props, 'float'))
-        self.failUnless(hasattr(C.props, 'long'))
+        self.assertTrue(hasattr(C.props, 'str'))
+        self.assertTrue(hasattr(C.props, 'int'))
+        self.assertTrue(hasattr(C.props, 'float'))
+        self.assertTrue(hasattr(C.props, 'long'))
 
         o = C()
         self.assertEqual(o.str, '')
diff --git a/tests/test_pygtkcompat.py b/tests/test_pygtkcompat.py
index 6840a1c..5999a75 100644
--- a/tests/test_pygtkcompat.py
+++ b/tests/test_pygtkcompat.py
@@ -23,17 +23,17 @@ import gtk.gdk
 
 class TestATKCompat(unittest.TestCase):
     def testObject(self):
-        self.failUnless(hasattr(atk, 'Object'))
+        self.assertTrue(hasattr(atk, 'Object'))
 
 
 class TestPangoCompat(unittest.TestCase):
     def testLayout(self):
-        self.failUnless(hasattr(pango, 'Layout'))
+        self.assertTrue(hasattr(pango, 'Layout'))
 
 
 class TestPangoCairoCompat(unittest.TestCase):
     def testErrorUnderlinePath(self):
-        self.failUnless(hasattr(pangocairo, 'error_underline_path'))
+        self.assertTrue(hasattr(pangocairo, 'error_underline_path'))
 
 
 class TestGTKCompat(unittest.TestCase):
@@ -51,11 +51,11 @@ class TestGTKCompat(unittest.TestCase):
     def testKeysyms(self):
         import gtk.keysyms
         self.assertEquals(gtk.keysyms.Escape, Gdk.KEY_Escape)
-        self.failUnless(gtk.keysyms._0, Gdk.KEY_0)
+        self.assertTrue(gtk.keysyms._0, Gdk.KEY_0)
 
     def testStyle(self):
         widget = gtk.Button()
-        self.failUnless(isinstance(widget.style.base[gtk.STATE_NORMAL],
+        self.assertTrue(isinstance(widget.style.base[gtk.STATE_NORMAL],
                                    gtk.gdk.Color))
 
     def testAlignment(self):
@@ -71,16 +71,16 @@ class TestGTKCompat(unittest.TestCase):
 
         box.pack_start(child)
         expand, fill, padding, pack_type = box.query_child_packing(child)
-        self.failUnless(expand)
-        self.failUnless(fill)
+        self.assertTrue(expand)
+        self.assertTrue(fill)
         self.assertEquals(padding, 0)
         self.assertEquals(pack_type, gtk.PACK_START)
 
         child = gtk.Button()
         box.pack_end(child)
         expand, fill, padding, pack_type = box.query_child_packing(child)
-        self.failUnless(expand)
-        self.failUnless(fill)
+        self.assertTrue(expand)
+        self.assertTrue(fill)
         self.assertEquals(padding, 0)
         self.assertEquals(pack_type, gtk.PACK_END)
 
diff --git a/tests/test_signal.py b/tests/test_signal.py
index 57c608d..46be7fc 100644
--- a/tests/test_signal.py
+++ b/tests/test_signal.py
@@ -314,7 +314,7 @@ class SigPropClass(GObject.GObject):
 class TestSigProp(unittest.TestCase):
     def testEmitInPropertySetter(self):
         obj = SigPropClass()
-        self.failIf(obj.signal_emission_failed)
+        self.assertFalse(obj.signal_emission_failed)
 
 f = GObject.SignalFlags.RUN_FIRST
 l = GObject.SignalFlags.RUN_LAST
@@ -355,7 +355,7 @@ class _TestCMarshaller:
 
     def testTestReturnFloat(self):
         rv = self.obj.emit("test-float", 1.234)
-        self.failUnless(rv >= 1.233999 and rv <= 1.2400001, rv)
+        self.assertTrue(rv >= 1.233999 and rv <= 1.2400001, rv)
 
     def testTestReturnDouble(self):
         rv = self.obj.emit("test-double", 1.234)