diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-19 12:53:51 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-19 12:01:33 +0000 |
| commit | 3e5822422f6d1ca16a43024b22feb9eacad11acf (patch) | |
| tree | 6013c1913f45fb6bc6eecf15d902a9956a4212f6 | |
| parent | ee9d73c6332f284271b51b869eb0d6320657489e (diff) | |
Tests: Fix deprecation warnings
Replace assert_() by assertTrue() and assertEquals()
by assertEqual() to fix repeated warnings:
DeprecationWarning: Please use assertTrue instead.
DeprecationWarning: Please use assertEqual instead.
Task-number: PYSIDE-431
Change-Id: I6b9a8b85798c05e1067ed9a5a612378783ccd0a1
Reviewed-by: Christian Tismer <tismer@stackless.com>
128 files changed, 282 insertions, 282 deletions
diff --git a/tests/QtCore/blocking_signals_test.py b/tests/QtCore/blocking_signals_test.py index b9d9c5f4..64d5335a 100644 --- a/tests/QtCore/blocking_signals_test.py +++ b/tests/QtCore/blocking_signals_test.py @@ -42,10 +42,10 @@ class TestSignalsBlockedBasic(unittest.TestCase): The signals aren't blocked by default. blockSignals returns the previous value''' obj = QObject() - self.assert_(not obj.signalsBlocked()) - self.assert_(not obj.blockSignals(True)) - self.assert_(obj.signalsBlocked()) - self.assert_(obj.blockSignals(False)) + self.assertTrue(not obj.signalsBlocked()) + self.assertTrue(not obj.blockSignals(True)) + self.assertTrue(obj.signalsBlocked()) + self.assertTrue(obj.blockSignals(False)) class TestSignalsBlocked(unittest.TestCase): '''Test case to check if the signals are really blocked''' @@ -73,12 +73,12 @@ class TestSignalsBlocked(unittest.TestCase): QObject.connect(self.obj, SIGNAL('mysignal()'), self.callback) self.obj.emit(SIGNAL('mysignal()')) - self.assert_(self.called) + self.assertTrue(self.called) self.called = False self.obj.blockSignals(True) self.obj.emit(SIGNAL('mysignal()')) - self.assert_(not self.called) + self.assertTrue(not self.called) def testPythonSignals(self): #Blocking of Python typed signals @@ -86,12 +86,12 @@ class TestSignalsBlocked(unittest.TestCase): self.args = (1, 3) self.obj.emit(SIGNAL('mysignal(int,int)'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) self.called = False self.obj.blockSignals(True) self.obj.emit(SIGNAL('mysignal(int,int)'), *self.args) - self.assert_(not self.called) + self.assertTrue(not self.called) class TestQFileSignalBlocking(unittest.TestCase): '''Test case for blocking the signal QIODevice.aboutToClose()''' @@ -118,16 +118,16 @@ class TestQFileSignalBlocking(unittest.TestCase): QObject.connect(self.qfile, SIGNAL('aboutToClose()'), self.callback) - self.assert_(self.qfile.open(QFile.ReadOnly)) + self.assertTrue(self.qfile.open(QFile.ReadOnly)) self.qfile.close() - self.assert_(self.called) + self.assertTrue(self.called) self.called = False self.qfile.blockSignals(True) - self.assert_(self.qfile.open(QFile.ReadOnly)) + self.assertTrue(self.qfile.open(QFile.ReadOnly)) self.qfile.close() - self.assert_(not self.called) + self.assertTrue(not self.called) if __name__ == '__main__': diff --git a/tests/QtCore/bug_820.py b/tests/QtCore/bug_820.py index ed9854e6..ef005fd5 100644 --- a/tests/QtCore/bug_820.py +++ b/tests/QtCore/bug_820.py @@ -83,8 +83,8 @@ class MyObject(QObject): class SlotWithDecoratorTest(unittest.TestCase): def testSlots(self): o = MyObject() - self.assert_(o.metaObject().indexOfSlot("mySlot()") > 0) - self.assert_(o.metaObject().indexOfSlot("mySlot2()") > 0) + self.assertTrue(o.metaObject().indexOfSlot("mySlot()") > 0) + self.assertTrue(o.metaObject().indexOfSlot("mySlot2()") > 0) o.events.connect(o.mySlot) o.events.connect(o.mySlot2) diff --git a/tests/QtCore/bug_826.py b/tests/QtCore/bug_826.py index e387a7bc..e94e4bdc 100644 --- a/tests/QtCore/bug_826.py +++ b/tests/QtCore/bug_826.py @@ -46,8 +46,8 @@ class TestEvent(QEvent): class TestEnums(unittest.TestCase): def testUserTypesValues(self): - self.assert_(QEvent.User <= int(TestEvent.TestEventType) <= QEvent.MaxUser) - self.assert_(QEvent.User <= int(TEST_EVENT_TYPE) <= QEvent.MaxUser) + self.assertTrue(QEvent.User <= int(TestEvent.TestEventType) <= QEvent.MaxUser) + self.assertTrue(QEvent.User <= int(TEST_EVENT_TYPE) <= QEvent.MaxUser) def testUserTypesRepr(self): self.assertEqual(eval(repr(TestEvent.TestEventType)), TestEvent.TestEventType) diff --git a/tests/QtCore/child_event_test.py b/tests/QtCore/child_event_test.py index ea9948bc..6b0ac211 100644 --- a/tests/QtCore/child_event_test.py +++ b/tests/QtCore/child_event_test.py @@ -74,7 +74,7 @@ class TestChildEvent(UsesQCoreApplication): parent = ExtQTimer() child = QObject() child.setParent(parent) - self.assert_(parent.child_event_received) + self.assertTrue(parent.child_event_received) if __name__ == '__main__': unittest.main() diff --git a/tests/QtCore/deepcopy_test.py b/tests/QtCore/deepcopy_test.py index c61299f5..e6f4fe17 100644 --- a/tests/QtCore/deepcopy_test.py +++ b/tests/QtCore/deepcopy_test.py @@ -36,7 +36,7 @@ from PySide2.QtCore import QUuid class DeepCopyHelper: def testCopy(self): copy = deepcopy([self.original])[0] - self.assert_(copy is not self.original) + self.assertTrue(copy is not self.original) self.assertEqual(copy, self.original) class QByteArrayDeepCopy(DeepCopyHelper, unittest.TestCase): diff --git a/tests/QtCore/destroysignal_test.py b/tests/QtCore/destroysignal_test.py index 2d0d9497..0d48f283 100644 --- a/tests/QtCore/destroysignal_test.py +++ b/tests/QtCore/destroysignal_test.py @@ -32,7 +32,7 @@ import unittest class TestDestroySignal(unittest.TestCase): def onObjectDestroyed(self, timer): - self.assert_(isinstance(timer, QObject)) + self.assertTrue(isinstance(timer, QObject)) self._destroyed = True def testSignal(self): @@ -40,7 +40,7 @@ class TestDestroySignal(unittest.TestCase): t = QTimer() t.destroyed[QObject].connect(self.onObjectDestroyed) del t - self.assert_(self._destroyed) + self.assertTrue(self._destroyed) def testWithParent(self): self._destroyed = False @@ -48,7 +48,7 @@ class TestDestroySignal(unittest.TestCase): t = QTimer(p) t.destroyed[QObject].connect(self.onObjectDestroyed) del p - self.assert_(self._destroyed) + self.assertTrue(self._destroyed) if __name__ == '__main__': unittest.main() diff --git a/tests/QtCore/duck_punching_test.py b/tests/QtCore/duck_punching_test.py index 31e7bb7c..c0ee4403 100644 --- a/tests/QtCore/duck_punching_test.py +++ b/tests/QtCore/duck_punching_test.py @@ -70,7 +70,7 @@ class TestDuckPunchingOnQObjectInstance(UsesQCoreApplication): parent.childEvent = MethodType(childEvent, parent, QObject) child = QObject() child.setParent(parent) - self.assert_(self.duck_childEvent_called) + self.assertTrue(self.duck_childEvent_called) # This is done to decrease the refcount of the vm object # allowing the object wrapper to be deleted before the # BindingManager. This is useful when compiling Shiboken @@ -89,7 +89,7 @@ class TestDuckPunchingOnQObjectInstance(UsesQCoreApplication): parent.childEvent = MethodType(childEvent, parent, QObject) child = QObject() child.setParent(parent) - self.assert_(self.duck_childEvent_called) + self.assertTrue(self.duck_childEvent_called) # This is done to decrease the refcount of the vm object # allowing the object wrapper to be deleted before the # BindingManager. This is useful when compiling Shiboken diff --git a/tests/QtCore/max_signals.py b/tests/QtCore/max_signals.py index 4b70450b..c3bb7b30 100644 --- a/tests/QtCore/max_signals.py +++ b/tests/QtCore/max_signals.py @@ -50,7 +50,7 @@ class TestSignalLimitless(unittest.TestCase): #chek if the signals are valid m = o.metaObject() for i in range(self.SIGNAL_MAX): - self.assert_(m.indexOfSignal('sig%d()'%i) > 0) + self.assertTrue(m.indexOfSignal('sig%d()'%i) > 0) #emit all 100 signals for i in range(self.SIGNAL_MAX): diff --git a/tests/QtCore/mockclass_test.py b/tests/QtCore/mockclass_test.py index 9249e511..ab794b0a 100644 --- a/tests/QtCore/mockclass_test.py +++ b/tests/QtCore/mockclass_test.py @@ -48,7 +48,7 @@ class MockClassTest(unittest.TestCase): mock = Mock() setattr(QCoreApplication, 'instance', mock) QCoreApplication.instance() - self.assert_(mock.called) + self.assertTrue(mock.called) if __name__ == '__main__': unittest.main() diff --git a/tests/QtCore/qdate_test.py b/tests/QtCore/qdate_test.py index 3df3c607..9554e41e 100644 --- a/tests/QtCore/qdate_test.py +++ b/tests/QtCore/qdate_test.py @@ -38,7 +38,7 @@ class TestQDate (unittest.TestCase): def testGetDate(self): date = QDate(2009, 22, 9) tuple_ = date.getDate() - self.assertEquals(tuple, tuple_.__class__) + self.assertEqual(tuple, tuple_.__class__) (y, m, d) = tuple_ self.assertEqual(date.year(), y) self.assertEqual(date.month(), m) @@ -47,7 +47,7 @@ class TestQDate (unittest.TestCase): def testGetWeekNumber(self): date = QDate(2000, 1, 1) tuple_ = date.weekNumber() - self.assertEquals(tuple, tuple_.__class__) + self.assertEqual(tuple, tuple_.__class__) (week, yearNumber) = tuple_ self.assertEqual(week, 52) self.assertEqual(yearNumber, 1999) diff --git a/tests/QtCore/qlinef_test.py b/tests/QtCore/qlinef_test.py index 8e86d9bf..1388e5aa 100644 --- a/tests/QtCore/qlinef_test.py +++ b/tests/QtCore/qlinef_test.py @@ -40,9 +40,9 @@ class TestQLineF (unittest.TestCase): l1 = QLineF(0, 0, 1, 0) l2 = QLineF(1, -1, 1, 1) tuple_ = l1.intersect(l2) - self.assertEquals(tuple, tuple_.__class__) + self.assertEqual(tuple, tuple_.__class__) (value, p) = tuple_ - self.assertEquals(QLineF.BoundedIntersection, value) + self.assertEqual(QLineF.BoundedIntersection, value) self.assertEqual(QPointF(1, 0), p) if __name__ == '__main__': diff --git a/tests/QtCore/qlocale_test.py b/tests/QtCore/qlocale_test.py index 12a49ed8..63aa3293 100644 --- a/tests/QtCore/qlocale_test.py +++ b/tests/QtCore/qlocale_test.py @@ -63,7 +63,7 @@ class QLocaleTestToNumber(unittest.TestCase): def testToNumberULongLongNegative(self): obj = QLocale(QLocale.C) - self.assert_(not obj.toULongLong('-37')[1]) + self.assertTrue(not obj.toULongLong('-37')[1]) if __name__ == '__main__': unittest.main() diff --git a/tests/QtCore/qmetaobject_test.py b/tests/QtCore/qmetaobject_test.py index 91ce95f3..536fbe36 100644 --- a/tests/QtCore/qmetaobject_test.py +++ b/tests/QtCore/qmetaobject_test.py @@ -76,7 +76,7 @@ class qmetaobject_test(unittest.TestCase): #o.connect(o, SIGNAL("foo()"), o2, SIGNAL("bar()")) #signal_index = o.metaObject().indexOfMethod("foo()"); - #self.assert_(slot_index != signal_index) + #self.assertTrue(slot_index != signal_index) if __name__ == '__main__': diff --git a/tests/QtCore/qobject_children_segfault_test.py b/tests/QtCore/qobject_children_segfault_test.py index ef21a4cc..651233d8 100644 --- a/tests/QtCore/qobject_children_segfault_test.py +++ b/tests/QtCore/qobject_children_segfault_test.py @@ -49,7 +49,7 @@ class ChildrenCoreApplication(unittest.TestCase): # del children # del child2 del parent # XXX Segfaults here - self.assert_(True) + self.assertTrue(True) if __name__ == '__main__': diff --git a/tests/QtCore/qobject_connect_notify_test.py b/tests/QtCore/qobject_connect_notify_test.py index 6d917d38..629a79a6 100644 --- a/tests/QtCore/qobject_connect_notify_test.py +++ b/tests/QtCore/qobject_connect_notify_test.py @@ -68,34 +68,34 @@ class TestQObjectConnectNotify(UsesQCoreApplication): sender = Obj() receiver = QObject() sender.connect(SIGNAL("destroyed()"), receiver, SLOT("deleteLater()")) - self.assert_(sender.con_notified) + self.assertTrue(sender.con_notified) self.assertEqual(sender.signal, SIGNAL("destroyed()")) sender.disconnect(SIGNAL("destroyed()"), receiver, SLOT("deleteLater()")) - self.assert_(sender.dis_notified) + self.assertTrue(sender.dis_notified) def testPySignal(self): sender = Obj() receiver = QObject() sender.connect(SIGNAL("foo()"), receiver, SLOT("deleteLater()")) - self.assert_(sender.con_notified) + self.assertTrue(sender.con_notified) sender.disconnect(SIGNAL("foo()"), receiver, SLOT("deleteLater()")) - self.assert_(sender.dis_notified) + self.assertTrue(sender.dis_notified) def testPySlots(self): sender = Obj() receiver = QObject() sender.connect(SIGNAL("destroyed()"), cute_slot) - self.assert_(sender.con_notified) + self.assertTrue(sender.con_notified) sender.disconnect(SIGNAL("destroyed()"), cute_slot) - self.assert_(sender.dis_notified) + self.assertTrue(sender.dis_notified) def testpyAll(self): sender = Obj() receiver = QObject() sender.connect(SIGNAL("foo()"), cute_slot) - self.assert_(sender.con_notified) + self.assertTrue(sender.con_notified) sender.disconnect(SIGNAL("foo()"), cute_slot) - self.assert_(sender.dis_notified) + self.assertTrue(sender.dis_notified) if __name__ == '__main__': unittest.main() diff --git a/tests/QtCore/qobject_inherits_test.py b/tests/QtCore/qobject_inherits_test.py index 28a89526..8c4c797a 100644 --- a/tests/QtCore/qobject_inherits_test.py +++ b/tests/QtCore/qobject_inherits_test.py @@ -38,7 +38,7 @@ class InheritsCase(unittest.TestCase): def testCppInheritance(self): #QObject.inherits() for c++ classes #An class inherits itself - self.assert_(QObject().inherits('QObject')) + self.assertTrue(QObject().inherits('QObject')) def testPythonInheritance(self): #QObject.inherits() for python classes @@ -47,9 +47,9 @@ class InheritsCase(unittest.TestCase): #Dummy class pass - self.assert_(Dummy().inherits('QObject')) - self.assert_(Dummy().inherits('Dummy')) - self.assert_(not Dummy().inherits('FooBar')) + self.assertTrue(Dummy().inherits('QObject')) + self.assertTrue(Dummy().inherits('Dummy')) + self.assertTrue(not Dummy().inherits('FooBar')) def testPythonMultiInheritance(self): #QObject.inherits() for multiple inheritance @@ -63,8 +63,8 @@ class InheritsCase(unittest.TestCase): #Dummy class pass - self.assert_(Dummy().inherits('QObject')) - self.assert_(not Dummy().inherits('Parent')) + self.assertTrue(Dummy().inherits('QObject')) + self.assertTrue(not Dummy().inherits('Parent')) def testSetAttributeBeforeCallingInitOnQObjectDerived(self): '''Test for bug #428.''' diff --git a/tests/QtCore/qobject_property_test.py b/tests/QtCore/qobject_property_test.py index 6706aa6c..537a6247 100644 --- a/tests/QtCore/qobject_property_test.py +++ b/tests/QtCore/qobject_property_test.py @@ -56,7 +56,7 @@ class PropertyWithNotify(unittest.TestCase): obj = MyObjectWithNotifyProperty() obj.notifyP.connect(self.called) obj.myProperty = 10 - self.assert_(self.called_) + self.assertTrue(self.called_) def testHasProperty(self): o = MyObjectWithNotifyProperty() diff --git a/tests/QtCore/qrect_test.py b/tests/QtCore/qrect_test.py index f570eea0..e9bc4d60 100644 --- a/tests/QtCore/qrect_test.py +++ b/tests/QtCore/qrect_test.py @@ -40,7 +40,7 @@ class RectConstructor(unittest.TestCase): #QRect() obj = QRect() - self.assert_(obj.isNull()) + self.assertTrue(obj.isNull()) def testConstructorQPoint(self): topLeft = QPoint(3, 0) diff --git a/tests/QtCore/qslot_object_test.py b/tests/QtCore/qslot_object_test.py index 5abb62e3..3fc1d901 100644 --- a/tests/QtCore/qslot_object_test.py +++ b/tests/QtCore/qslot_object_test.py @@ -67,7 +67,7 @@ class slotTest(unittest.TestCase): QtCore.QTimer.singleShot(1000, self.quit_app) qApp.exec_() - self.assert_(my_obj.ok) + self.assertTrue(my_obj.ok) if __name__ == '__main__': diff --git a/tests/QtCore/qstate_test.py b/tests/QtCore/qstate_test.py index 020a2ca0..f877d1eb 100644 --- a/tests/QtCore/qstate_test.py +++ b/tests/QtCore/qstate_test.py @@ -45,7 +45,7 @@ class QStateTest(unittest.TestCase): s2 = QFinalState() t = s1.addTransition(o, SIGNAL("change()"), s2); - self.assert_(isinstance(t, QSignalTransition)) + self.assertTrue(isinstance(t, QSignalTransition)) machine.addState(s1) machine.addState(s2) @@ -58,7 +58,7 @@ class QStateTest(unittest.TestCase): app.exec_() txt = o.property("text") - self.assert_(txt, "Rocks") + self.assertTrue(txt, "Rocks") if __name__ == '__main__': unittest.main() diff --git a/tests/QtCore/qstatemachine_test.py b/tests/QtCore/qstatemachine_test.py index af0324d7..6cfa59e1 100644 --- a/tests/QtCore/qstatemachine_test.py +++ b/tests/QtCore/qstatemachine_test.py @@ -89,8 +89,8 @@ class QSetConverterTest(UsesQCoreApplication): configuration = machine.configuration() - self.assert_(isinstance(configuration, set)) - self.assert_(s1 in configuration) + self.assertTrue(isinstance(configuration, set)) + self.assertTrue(s1 in configuration) if __name__ == '__main__': diff --git a/tests/QtCore/qsysinfo_test.py b/tests/QtCore/qsysinfo_test.py index 2756cbab..524728ef 100644 --- a/tests/QtCore/qsysinfo_test.py +++ b/tests/QtCore/qsysinfo_test.py @@ -33,10 +33,10 @@ class TestQSysInfo(unittest.TestCase): def testEnumEndian(self): self.assertEqual(QSysInfo.BigEndian, 0) self.assertEqual(QSysInfo.LittleEndian, 1) - self.assert_(QSysInfo.ByteOrder > -1) + self.assertTrue(QSysInfo.ByteOrder > -1) def testEnumSizes(self): - self.assert_(QSysInfo.WordSize > 0) + self.assertTrue(QSysInfo.WordSize > 0) if __name__ == '__main__': unittest.main() diff --git a/tests/QtCore/qtext_codec_test.py b/tests/QtCore/qtext_codec_test.py index 1077412b..dbd812f9 100644 --- a/tests/QtCore/qtext_codec_test.py +++ b/tests/QtCore/qtext_codec_test.py @@ -36,12 +36,12 @@ class TestCodecGetters(unittest.TestCase): def testCodecsNames(self): for codec_name in QTextCodec.availableCodecs(): codec = QTextCodec.codecForName(codec_name) - self.assert_(type(codec), QTextCodec) + self.assertTrue(type(codec), QTextCodec) def testCodecsMibs(self): for codec_num in QTextCodec.availableMibs(): codec = QTextCodec.codecForMib(codec_num) - self.assert_(type(codec), QTextCodec) + self.assertTrue(type(codec), QTextCodec) if __name__ == '__main__': diff --git a/tests/QtCore/qthread_signal_test.py b/tests/QtCore/qthread_signal_test.py index c0cf6792..744797de 100644 --- a/tests/QtCore/qthread_signal_test.py +++ b/tests/QtCore/qthread_signal_test.py @@ -85,7 +85,7 @@ class BasicConnection(unittest.TestCase): app.exec_() thread.wait() - self.assert_(thread.target.called) + self.assertTrue(thread.target.called) if __name__ == '__main__': unittest.main() diff --git a/tests/QtCore/qthread_test.py b/tests/QtCore/qthread_test.py index 946c79e8..cee32d65 100644 --- a/tests/QtCore/qthread_test.py +++ b/tests/QtCore/qthread_test.py @@ -64,9 +64,9 @@ class QThreadSimpleCase(UsesQCoreApplication): #Basic QThread test obj = Dummy() obj.start() - self.assert_(obj.wait(100)) + self.assertTrue(obj.wait(100)) - self.assert_(obj.called) + self.assertTrue(obj.called) def cb(self, *args): self.called = True @@ -89,7 +89,7 @@ class QThreadSimpleCase(UsesQCoreApplication): QTimer.singleShot(1000, self.abort_application) self.app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) def testSignalStarted(self): #QThread.started() (signal) @@ -102,7 +102,7 @@ class QThreadSimpleCase(UsesQCoreApplication): self.app.exec_() self.assertEqual(obj.qobj.thread(), obj) # test QObject.thread() method - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': unittest.main() diff --git a/tests/QtCore/qtimer_singleshot_test.py b/tests/QtCore/qtimer_singleshot_test.py index 59e7ff52..d5e94538 100644 --- a/tests/QtCore/qtimer_singleshot_test.py +++ b/tests/QtCore/qtimer_singleshot_test.py @@ -70,7 +70,7 @@ class TestSingleShot(UsesQCoreApplication): def testSingleShot(self): QTimer.singleShot(100, self.callback) self.app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) class SigEmitter(QObject): @@ -99,7 +99,7 @@ class TestSingleShotSignal(UsesQCoreApplication): emitter.sig1.connect(self.callback) QTimer.singleShot(100, emitter.sig1) self.app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': unittest.main() diff --git a/tests/QtCore/qtimer_timeout_test.py b/tests/QtCore/qtimer_timeout_test.py index b2494830..a185a65f 100644 --- a/tests/QtCore/qtimer_timeout_test.py +++ b/tests/QtCore/qtimer_timeout_test.py @@ -79,7 +79,7 @@ class TestTimeoutSignal(UsesQCoreApplication): self.app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) self.assertEqual(sys.getrefcount(self.timer), refCount) if __name__ == '__main__': diff --git a/tests/QtCore/qtnamespace_test.py b/tests/QtCore/qtnamespace_test.py index e2e984dd..f00e7bd9 100644 --- a/tests/QtCore/qtnamespace_test.py +++ b/tests/QtCore/qtnamespace_test.py @@ -41,7 +41,7 @@ class QtNamespace(unittest.TestCase): #Access to Qt namespace getattr(Qt, 'Horizontal') getattr(Qt, 'WindowMaximizeButtonHint') - self.assert_(True) + self.assertTrue(True) if __name__ == '__main__': diff --git a/tests/QtCore/repr_test.py b/tests/QtCore/repr_test.py index 73a2087f..a32ec7d8 100644 --- a/tests/QtCore/repr_test.py +++ b/tests/QtCore/repr_test.py @@ -36,7 +36,7 @@ from PySide2.QtCore import QUuid class ReprCopyHelper: def testCopy(self): copy = eval(self.original.__repr__()) - self.assert_(copy is not self.original) + self.assertTrue(copy is not self.original) self.assertEqual(copy, self.original) class QByteArrayReprCopy(ReprCopyHelper, unittest.TestCase): diff --git a/tests/QtCore/static_method_test.py b/tests/QtCore/static_method_test.py index cd40312e..736feaea 100644 --- a/tests/QtCore/static_method_test.py +++ b/tests/QtCore/static_method_test.py @@ -62,13 +62,13 @@ class StaticNonStaticMethodsTest(unittest.TestCase): def testCallingStaticMethodWithClass(self): '''Call static method using class.''' - self.assert_(QFile.exists(self.existing_filename)) + self.assertTrue(QFile.exists(self.existing_filename)) self.assertFalse(QFile.exists(self.non_existing_filename)) def testCallingStaticMethodWithInstance(self): '''Call static method using instance of class.''' f = QFile(self.non_existing_filename) - self.assert_(f.exists(self.existing_filename)) + self.assertTrue(f.exists(self.existing_filename)) self.assertFalse(f.exists(self.non_existing_filename)) def testCallingInstanceMethod(self): @@ -76,7 +76,7 @@ class StaticNonStaticMethodsTest(unittest.TestCase): f1 = QFile(self.non_existing_filename) self.assertFalse(f1.exists()) f2 = QFile(self.existing_filename) - self.assert_(f2.exists()) + self.assertTrue(f2.exists()) if __name__ == '__main__': diff --git a/tests/QtCore/thread_signals_test.py b/tests/QtCore/thread_signals_test.py index 65333ef4..351c6f5d 100644 --- a/tests/QtCore/thread_signals_test.py +++ b/tests/QtCore/thread_signals_test.py @@ -55,7 +55,7 @@ class TestThreadSignal(UsesQCoreApplication): self.app.exec_() t.wait() - self.assert_(self.__called__); + self.assertTrue(self.__called__); if __name__ == '__main__': unittest.main() diff --git a/tests/QtGui/bug_300_test.py b/tests/QtGui/bug_300_test.py index 7da1f46c..1ab71569 100644 --- a/tests/QtGui/bug_300_test.py +++ b/tests/QtGui/bug_300_test.py @@ -39,7 +39,7 @@ class TestQAbstractItemModelSignals(unittest.TestCase): m = QStringListModel() m.rowsAboutToBeInserted[QModelIndex,int,int].connect(self.sigCallback) m.insertRows(0, 3) - self.assert_(self._called) + self.assertTrue(self._called) if __name__ == '__main__': unittest.main() diff --git a/tests/QtGui/bug_367.py b/tests/QtGui/bug_367.py index 14b326ed..375412b9 100644 --- a/tests/QtGui/bug_367.py +++ b/tests/QtGui/bug_367.py @@ -44,7 +44,7 @@ class BugTest(UsesQApplication): self.assertEqual(rcount+1, sys.getrefcount(item)) parentItem = item - self.assert_(True) + self.assertTrue(True) if __name__ == '__main__': unittest.main() diff --git a/tests/QtGui/bug_480.py b/tests/QtGui/bug_480.py index 4d67d587..75524841 100644 --- a/tests/QtGui/bug_480.py +++ b/tests/QtGui/bug_480.py @@ -46,7 +46,7 @@ class LayoutTransferOwnerShip(unittest.TestCase): w = BuggyWidget() w.setup() w.show() - self.assert_(True) + self.assertTrue(True) if __name__ == '__main__': unittest.main() diff --git a/tests/QtGui/deepcopy_test.py b/tests/QtGui/deepcopy_test.py index fa862578..00df25cb 100644 --- a/tests/QtGui/deepcopy_test.py +++ b/tests/QtGui/deepcopy_test.py @@ -41,13 +41,13 @@ from PySide2.QtGui import QPolygon class DeepCopyHelper: def testCopy(self): copy = deepcopy([self.original])[0] - self.assert_(copy is not self.original) + self.assertTrue(copy is not self.original) self.assertEqual(copy, self.original) class DeepCopyColorHelperF: def testCopy(self): copy = deepcopy([self.original])[0] - self.assert_(copy is not self.original) + self.assertTrue(copy is not self.original) self.assertEqual(copy.spec(), self.original.spec()) # impossible to compare float point # self.assertEqual(copy, self.original) diff --git a/tests/QtGui/qcolor_test.py b/tests/QtGui/qcolor_test.py index 52d8527d..10c4c907 100644 --- a/tests/QtGui/qcolor_test.py +++ b/tests/QtGui/qcolor_test.py @@ -46,7 +46,7 @@ class QColorGetTest(unittest.TestCase): hls = colorsys.rgb_to_hls(20.0/255, 40.0/255, 60.0/255) hsla = hls[0], hls[2], hls[1], self.color.alphaF() for x, y in zip(self.color.getHslF(), hsla): # Due to rounding problems - self.assert_(x - y < 1/100000.0) + self.assertTrue(x - y < 1/100000.0) def testGetHsv(self): hsv = colorsys.rgb_to_hsv(20.0/255, 40.0/255, 60.0/255) @@ -58,7 +58,7 @@ class QColorGetTest(unittest.TestCase): def testGetCmykF(self): # not supported by colorsys for x, y in zip(self.color.getCmykF(), (170/255.0, 85/255.0, 0, 195/255.0, 80/255.0)): - self.assert_(x - y < 1/10000.0) + self.assertTrue(x - y < 1/10000.0) class QColorQRgbConstructor(unittest.TestCase): @@ -91,7 +91,7 @@ class QColorCopy(unittest.TestCase): original = QColor(0, 0, 255) copy = deepcopy([original])[0] - self.assert_(original is not copy) + self.assertTrue(original is not copy) self.assertEqual(original, copy) del original self.assertEqual(copy, QColor(0, 0, 255)) @@ -101,7 +101,7 @@ class QColorCopy(unittest.TestCase): original = QColor() copy = deepcopy([original])[0] - self.assert_(original is not copy) + self.assertTrue(original is not copy) self.assertEqual(original, copy) del original self.assertEqual(copy, QColor()) diff --git a/tests/QtGui/qmatrix_test.py b/tests/QtGui/qmatrix_test.py index b0e88d6d..944b052c 100644 --- a/tests/QtGui/qmatrix_test.py +++ b/tests/QtGui/qmatrix_test.py @@ -67,10 +67,10 @@ class QMatrixTest(unittest.TestCase): m = QMatrix4x4(my_data) d = m.data() - self.assert_(my_datac, d) + self.assertTrue(my_datac, d) d = m.copyDataTo() - self.assert_(my_data == list(d)) + self.assertTrue(my_data == list(d)) def testMatrixMapping(self): m = QMatrix(1.0, 2.0, 1.0, 3.0, 100.0, 200.0) diff --git a/tests/QtGui/qpainter_test.py b/tests/QtGui/qpainter_test.py index 570245fd..7cecede5 100644 --- a/tests/QtGui/qpainter_test.py +++ b/tests/QtGui/qpainter_test.py @@ -46,7 +46,7 @@ class QPainterDrawText(unittest.TestCase): rect = self.painter.drawText(100, 100, 100, 100, Qt.AlignCenter | Qt.TextWordWrap, self.text) - self.assert_(isinstance(rect, QRect)) + self.assertTrue(isinstance(rect, QRect)) def testDrawTextWithRect(self): # bug #225 @@ -54,7 +54,7 @@ class QPainterDrawText(unittest.TestCase): newRect = self.painter.drawText(rect, Qt.AlignCenter | Qt.TextWordWrap, self.text) - self.assert_(isinstance(newRect, QRect)) + self.assertTrue(isinstance(newRect, QRect)) def testDrawTextWithRectF(self): '''QPainter.drawText(QRectF, ... ,QRectF*) inject code''' @@ -62,7 +62,7 @@ class QPainterDrawText(unittest.TestCase): newRect = self.painter.drawText(rect, Qt.AlignCenter | Qt.TextWordWrap, self.text) - self.assert_(isinstance(newRect, QRectF)) + self.assertTrue(isinstance(newRect, QRectF)) def testDrawOverloads(self): '''Calls QPainter.drawLines overloads, if something is diff --git a/tests/QtGui/qpixmap_test.py b/tests/QtGui/qpixmap_test.py index 4b0d67bb..b637f4d1 100644 --- a/tests/QtGui/qpixmap_test.py +++ b/tests/QtGui/qpixmap_test.py @@ -42,23 +42,23 @@ class QPixmapTest(UsesQApplication): def testQSizeConstructor(self): pixmap = QPixmap(QSize(10,20)) - self.assert_(pixmap.size().height(), 20) + self.assertTrue(pixmap.size().height(), 20) def testQStringConstructor(self): pixmap = QPixmap("Testing!") def testQPixmapLoadFromDataWithQFile(self): f = QFile(os.path.join(os.path.dirname(__file__), 'sample.png')) - self.assert_(f.open(QIODevice.ReadOnly)) + self.assertTrue(f.open(QIODevice.ReadOnly)) data = f.read(f.size()) f.close() pixmap = QPixmap() - self.assert_(pixmap.loadFromData(data)) + self.assertTrue(pixmap.loadFromData(data)) def testQPixmapLoadFromDataWithPython(self): data = open(os.path.join(os.path.dirname(__file__),'sample.png'),'rb').read() pixmap = QPixmap() - self.assert_(pixmap.loadFromData(data)) + self.assertTrue(pixmap.loadFromData(data)) class QPixmapToImage(UsesQApplication): diff --git a/tests/QtGui/qregion_test.py b/tests/QtGui/qregion_test.py index 81f63365..e3af650e 100644 --- a/tests/QtGui/qregion_test.py +++ b/tests/QtGui/qregion_test.py @@ -40,10 +40,10 @@ class QRegionTest(UsesQApplication): r2 = QRegion(5, 5, 10, 10) ru = r.united(r2) - self.assert_(ru.contains(QPoint(0,0))) - self.assert_(ru.contains(QPoint(5,5))) - self.assert_(ru.contains(QPoint(10,10))) - self.assert_(ru.contains(QPoint(14,14))) + self.assertTrue(ru.contains(QPoint(0,0))) + self.assertTrue(ru.contains(QPoint(5,5))) + self.assertTrue(ru.contains(QPoint(10,10))) + self.assertTrue(ru.contains(QPoint(14,14))) if __name__ == '__main__': unittest.main() diff --git a/tests/QtGui/qtextline_test.py b/tests/QtGui/qtextline_test.py index ff39046c..a541c6cf 100644 --- a/tests/QtGui/qtextline_test.py +++ b/tests/QtGui/qtextline_test.py @@ -37,7 +37,7 @@ class QTextLineTest(UsesQApplication): textLayout = QTextLayout() textLayout.beginLayout() line = textLayout.createLine() - self.assert_(line.isValid()) + self.assertTrue(line.isValid()) x, cursorPos = line.cursorToX(0) self.assertEqual(type(x), float) self.assertEqual(type(cursorPos), int) diff --git a/tests/QtGui/qtransform_test.py b/tests/QtGui/qtransform_test.py index 02f0064d..654484f9 100644 --- a/tests/QtGui/qtransform_test.py +++ b/tests/QtGui/qtransform_test.py @@ -36,8 +36,8 @@ class QTransformTest(unittest.TestCase): transform = QTransform() values = (10.0, 20.0) tx, ty = transform.map(*values) - self.assert_(isinstance(tx, float)) - self.assert_(isinstance(ty, float)) + self.assertTrue(isinstance(tx, float)) + self.assertTrue(isinstance(ty, float)) self.assertEqual((tx, ty), values) def testquadToQuad(self): @@ -58,7 +58,7 @@ class QTransformTest(unittest.TestCase): r2 = QTransform.quadToQuad(q1, q2) self.assertTrue(r1) - self.assert_(r2) + self.assertTrue(r2) self.assertEqual(t1, r2) @@ -74,7 +74,7 @@ class QTransformTest(unittest.TestCase): r2 = QTransform.quadToSquare(q1) self.assertTrue(r1) - self.assert_(r2) + self.assertTrue(r2) self.assertEqual(t1, r2) @@ -91,7 +91,7 @@ class QTransformTest(unittest.TestCase): r2 = QTransform.squareToQuad(q1) self.assertTrue(r1) - self.assert_(r2) + self.assertTrue(r2) self.assertEqual(t1, r2) diff --git a/tests/QtGui/repr_test.py b/tests/QtGui/repr_test.py index 40cf3bb2..90307e64 100644 --- a/tests/QtGui/repr_test.py +++ b/tests/QtGui/repr_test.py @@ -41,7 +41,7 @@ from PySide2.QtGui import QPolygon class ReprCopyHelper: def testCopy(self): copy = eval(self.original.__repr__()) - self.assert_(copy is not self.original) + self.assertTrue(copy is not self.original) self.assertEqual(copy, self.original) class QTransformReprCopy(ReprCopyHelper, unittest.TestCase): diff --git a/tests/QtMultimedia/audio_test.py b/tests/QtMultimedia/audio_test.py index 47c07638..0cc06cb7 100644 --- a/tests/QtMultimedia/audio_test.py +++ b/tests/QtMultimedia/audio_test.py @@ -64,7 +64,7 @@ class testAudioDevices(unittest.TestCase): fmt.setByteOrder(endian) if devInfo.isFormatSupported(fmt): return - self.assert_(False) + self.assertTrue(False) if __name__ == '__main__': diff --git a/tests/QtNetwork/accessManager_test.py b/tests/QtNetwork/accessManager_test.py index 7e6fc53c..11b21e84 100644 --- a/tests/QtNetwork/accessManager_test.py +++ b/tests/QtNetwork/accessManager_test.py @@ -65,7 +65,7 @@ class AccessManagerCase(UsesQCoreApplication): manager.finished.connect(self.slot_replyFinished) manager.get(QNetworkRequest(QUrl("http://127.0.0.1:%s" % self.httpd.port()))) self.app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': unittest.main() diff --git a/tests/QtNetwork/bug_446.py b/tests/QtNetwork/bug_446.py index d8b97254..4d3f3c0e 100644 --- a/tests/QtNetwork/bug_446.py +++ b/tests/QtNetwork/bug_446.py @@ -38,7 +38,7 @@ class HttpSignalsCase(UsesQCoreApplication): DATA = "PySide rocks" def onError(self): - self.assert_(False) + self.assertTrue(False) def onNewConnection(self): self.serverConnection = self.server.nextPendingConnection() @@ -58,7 +58,7 @@ class HttpSignalsCase(UsesQCoreApplication): def initServer(self): self.server = QTcpServer() self.server.newConnection.connect(self.onNewConnection) - self.assert_(self.server.listen()) + self.assertTrue(self.server.listen()) self.client = QTcpSocket() self.client.connected.connect(self.onClientConnect) self.client.connectToHost(QHostAddress(QHostAddress.LocalHost), self.server.serverPort()) diff --git a/tests/QtNetwork/udpsocket_test.py b/tests/QtNetwork/udpsocket_test.py index fc99aea2..4e3d9ae6 100644 --- a/tests/QtNetwork/udpsocket_test.py +++ b/tests/QtNetwork/udpsocket_test.py @@ -72,7 +72,7 @@ class HttpSignalsCase(unittest.TestCase): self.sendPackage() self.app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': unittest.main() diff --git a/tests/QtQml/connect_python_qml.py b/tests/QtQml/connect_python_qml.py index 7f6224e9..3eeffd0d 100755..100644 --- a/tests/QtQml/connect_python_qml.py +++ b/tests/QtQml/connect_python_qml.py @@ -59,7 +59,7 @@ class TestConnectionWithInvalidSignature(TimedQApplication): button.entered.emit() view.show() self.app.exec_() - self.assert_(self.buttonClicked) + self.assertTrue(self.buttonClicked) if __name__ == '__main__': unittest.main() diff --git a/tests/QtScript/property_test.py b/tests/QtScript/property_test.py index 4a328ebb..b958d310 100644 --- a/tests/QtScript/property_test.py +++ b/tests/QtScript/property_test.py @@ -74,7 +74,7 @@ class QPropertyTest(unittest.TestCase): if mp.name() == "x": found = True break - self.assert_(found) + self.assertTrue(found) def testScriptQProperty(self): qapp = QCoreApplication([]) diff --git a/tests/QtScriptTools/debugger_test.py b/tests/QtScriptTools/debugger_test.py index 8fb10f7b..6e27a72a 100644 --- a/tests/QtScriptTools/debugger_test.py +++ b/tests/QtScriptTools/debugger_test.py @@ -64,8 +64,8 @@ class DebuggerTest(UsesQApplication): self.debugger.action(QScriptEngineDebugger.InterruptAction).trigger() self.engine.evaluate("3+4\n2+1\n5+1") - self.assert_(self.has_resumed >= 1) - self.assert_(self.has_suspended >= 1) + self.assertTrue(self.has_resumed >= 1) + self.assertTrue(self.has_suspended >= 1) if __name__ == '__main__': unittest.main() diff --git a/tests/QtTest/click_test.py b/tests/QtTest/click_test.py index b245c224..e655371a 100644 --- a/tests/QtTest/click_test.py +++ b/tests/QtTest/click_test.py @@ -45,7 +45,7 @@ class MouseClickTest(UsesQApplication): button.setChecked(False) QTest.mouseClick(button, Qt.LeftButton) - self.assert_(button.isChecked()) + self.assertTrue(button.isChecked()) QTest.mouseClick(button, Qt.LeftButton) self.assertFalse(button.isChecked()) diff --git a/tests/QtTest/eventfilter_test.py b/tests/QtTest/eventfilter_test.py index 0a7a633f..e94b279b 100644 --- a/tests/QtTest/eventfilter_test.py +++ b/tests/QtTest/eventfilter_test.py @@ -67,7 +67,7 @@ class EventFilterTest(UsesQApplication): QTest.keyClick(widget, key) - self.assert_(eventFilter.processed) + self.assertTrue(eventFilter.processed) diff --git a/tests/QtUiTools/bug_376.py b/tests/QtUiTools/bug_376.py index f72b96ef..64b5acbd 100644 --- a/tests/QtUiTools/bug_376.py +++ b/tests/QtUiTools/bug_376.py @@ -40,7 +40,7 @@ class BugTest(UsesQApplication): filePath = os.path.join(os.path.dirname(__file__), 'test.ui') result = loader.load(filePath, w) - self.assert_(isinstance(result.child_object, QtWidgets.QFrame)) + self.assertTrue(isinstance(result.child_object, QtWidgets.QFrame)) if __name__ == '__main__': unittest.main() diff --git a/tests/QtUiTools/bug_392.py b/tests/QtUiTools/bug_392.py index a2d3a0ef..d788b29d 100644 --- a/tests/QtUiTools/bug_392.py +++ b/tests/QtUiTools/bug_392.py @@ -47,7 +47,7 @@ class BugTest(UsesQApplication): filePath = os.path.join(os.path.dirname(__file__), 'action.ui') result = loader.load(filePath, w) - self.assert_(isinstance(result.actionFoo, QtWidgets.QAction)) + self.assertTrue(isinstance(result.actionFoo, QtWidgets.QAction)) def testPythonCustomWidgets(self): w = QtWidgets.QWidget() @@ -56,8 +56,8 @@ class BugTest(UsesQApplication): filePath = os.path.join(os.path.dirname(__file__), 'pycustomwidget.ui') result = loader.load(filePath, w) - self.assert_(isinstance(result.custom, MyWidget)) - self.assert_(result.custom.isPython()) + self.assertTrue(isinstance(result.custom, MyWidget)) + self.assertTrue(result.custom.isPython()) def testPythonCustomWidgetsTwice(self): w = QtWidgets.QWidget() @@ -66,9 +66,9 @@ class BugTest(UsesQApplication): filePath = os.path.join(os.path.dirname(__file__), 'pycustomwidget2.ui') result = loader.load(filePath, w) - self.assert_(isinstance(result.custom, MyWidget)) - self.assert_(isinstance(result.custom2, MyWidget)) - self.assert_(result.custom.isPython()) + self.assertTrue(isinstance(result.custom, MyWidget)) + self.assertTrue(isinstance(result.custom2, MyWidget)) + self.assertTrue(result.custom.isPython()) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWebKit/webframe_test.py b/tests/QtWebKit/webframe_test.py index 86d5a54d..e82ae527 100644 --- a/tests/QtWebKit/webframe_test.py +++ b/tests/QtWebKit/webframe_test.py @@ -39,11 +39,11 @@ from helper import adjust_filename, UsesQApplication class TestWebFrame(UsesQApplication): def load_finished(self, ok): - self.assert_(ok) + self.assertTrue(ok) page = self.view.page() - self.assert_(page) + self.assertTrue(page) frame = page.mainFrame() - self.assert_(frame) + self.assertTrue(frame) meta = frame.metaData() self.assertEqual(meta['description'], ['PySide Test METADATA.']) self.app.quit() diff --git a/tests/QtWebKit/webpage_test.py b/tests/QtWebKit/webpage_test.py index 2be60f68..1abb6be4 100644 --- a/tests/QtWebKit/webpage_test.py +++ b/tests/QtWebKit/webpage_test.py @@ -60,13 +60,13 @@ class TestFindText(TimedQApplication): url = QUrl.fromLocalFile(adjust_filename('fox.html', __file__)) self.page.mainFrame().load(url) self.app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) def load_finished(self, ok): #Callback to check if load was successful if ok: self.called = True - self.assert_(self.page.findText('fox')) + self.assertTrue(self.page.findText('fox')) self.assertEqual(self.page.selectedText(), 'fox') self.app.quit() diff --git a/tests/QtWebKit/webview_test.py b/tests/QtWebKit/webview_test.py index 3fcf470b..f6c82e04 100644 --- a/tests/QtWebKit/webview_test.py +++ b/tests/QtWebKit/webview_test.py @@ -65,7 +65,7 @@ class TestLoadFinished(TimedQApplication): self.view.setUrl(url) self.app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) def testSetPageAndGetPage(self): twp = testWebPage() @@ -77,12 +77,12 @@ class TestLoadFinished(TimedQApplication): # Setting the same webpage should not incref the python obj refCount = sys.getrefcount(p) self.view.setPage(p) - self.assertEquals(sys.getrefcount(p), refCount) + self.assertEqual(sys.getrefcount(p), refCount) # Changing the webpage obj should decref the old one twp2 = testWebPage() self.view.setPage(twp2) - self.assertEquals(sys.getrefcount(p), refCount - 1) + self.assertEqual(sys.getrefcount(p), refCount - 1) def load_finished(self, ok): #Callback to check if load was successful diff --git a/tests/QtWidgets/add_action_test.py b/tests/QtWidgets/add_action_test.py index bba3d8e0..c6bc7abb 100644 --- a/tests/QtWidgets/add_action_test.py +++ b/tests/QtWidgets/add_action_test.py @@ -54,7 +54,7 @@ class AddActionTest(UsesQApplication): menubar = QMenuBar() action = menubar.addAction("Accounts", self._callback) action.activate(QAction.Trigger) - self.assert_(self.called) + self.assertTrue(self.called) def testWithCppSlot(self): '''QMenuBar.addAction(id, object, slot)''' @@ -64,7 +64,7 @@ class AddActionTest(UsesQApplication): widget.setChecked(False) action = menubar.addAction("Accounts", widget, SLOT("toggle()")) action.activate(QAction.Trigger) - self.assert_(widget.isChecked()) + self.assertTrue(widget.isChecked()) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/bug_243.py b/tests/QtWidgets/bug_243.py index c32d8784..361f02f1 100644 --- a/tests/QtWidgets/bug_243.py +++ b/tests/QtWidgets/bug_243.py @@ -39,7 +39,7 @@ class QAppPresence(unittest.TestCase): app = QApplication(sys.argv) window = QMainWindow() l = window.layout() - self.assert_(isinstance(l, QLayout)) + self.assertTrue(isinstance(l, QLayout)) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/bug_307.py b/tests/QtWidgets/bug_307.py index ae670505..4937f983 100644 --- a/tests/QtWidgets/bug_307.py +++ b/tests/QtWidgets/bug_307.py @@ -48,7 +48,7 @@ class QApplicationSignalsTest(unittest.TestCase): button = QPushButton("BUTTON") app.connect(button, SIGNAL("clicked()"), app.called) button.click() - self.assert_(app._called) + self.assertTrue(app._called) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/bug_400.py b/tests/QtWidgets/bug_400.py index 2e1d8483..ad673704 100644 --- a/tests/QtWidgets/bug_400.py +++ b/tests/QtWidgets/bug_400.py @@ -45,7 +45,7 @@ class BugTest(UsesQApplication): index = 0 while(_iter.value()): item = _iter.value() - self.assert_(item is items[index]) + self.assertTrue(item is items[index]) index += 1 _iter += 1 diff --git a/tests/QtWidgets/bug_416.py b/tests/QtWidgets/bug_416.py index eacd083c..988f3f83 100644 --- a/tests/QtWidgets/bug_416.py +++ b/tests/QtWidgets/bug_416.py @@ -65,7 +65,7 @@ class TestBug(TimedQApplication): check.stateChanged[int].emit(1) check.show() self.app.exec_() - self.assert_(t1.eventTested) + self.assertTrue(t1.eventTested) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/bug_467.py b/tests/QtWidgets/bug_467.py index f367a6c6..0bc5ed80 100644 --- a/tests/QtWidgets/bug_467.py +++ b/tests/QtWidgets/bug_467.py @@ -41,7 +41,7 @@ class BugTest(UsesQApplication): def testCase(self): w = MyWidget() widgets = QApplication.allWidgets() - self.assert_(w in widgets) + self.assertTrue(w in widgets) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/bug_549.py b/tests/QtWidgets/bug_549.py index dcbcf9a8..24159dbc 100644 --- a/tests/QtWidgets/bug_549.py +++ b/tests/QtWidgets/bug_549.py @@ -35,9 +35,9 @@ class TestBug549(unittest.TestCase): app = QApplication([]) w = QGraphicsWidget() w.setContentsMargins(1, 2, 3, 4) - self.assertEquals(w.getContentsMargins(), (1, 2, 3, 4)) + self.assertEqual(w.getContentsMargins(), (1, 2, 3, 4)) w.setWindowFrameMargins(5, 6, 7, 8) - self.assertEquals(w.getWindowFrameMargins(), (5, 6, 7, 8)) + self.assertEqual(w.getWindowFrameMargins(), (5, 6, 7, 8)) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/bug_632.py b/tests/QtWidgets/bug_632.py index 1f07f48d..fa806341 100644 --- a/tests/QtWidgets/bug_632.py +++ b/tests/QtWidgets/bug_632.py @@ -41,7 +41,7 @@ class Bug589(unittest.TestCase): text = QLineEdit("PySide bug 632") text.setTextMargins(10, 20, 30, 40) (a, b, c, d) = text.getTextMargins() - self.assert_((a, b, c, d), (10, 20, 30, 40)) + self.assertTrue((a, b, c, d), (10, 20, 30, 40)) if __name__ == "__main__": app = QApplication(sys.argv) diff --git a/tests/QtWidgets/bug_635.py b/tests/QtWidgets/bug_635.py index 1eb709c3..f23241d3 100644 --- a/tests/QtWidgets/bug_635.py +++ b/tests/QtWidgets/bug_635.py @@ -42,7 +42,7 @@ class testQToolBar(unittest.TestCase): self._called = False a = bar.addAction("act1", self.callback) a.trigger() - self.assert_(self._called) + self.assertTrue(self._called) def testAddActionWithIcon(self): bar = QToolBar() @@ -50,7 +50,7 @@ class testQToolBar(unittest.TestCase): icon = QIcon() a = bar.addAction(icon, "act1", self.callback) a.trigger() - self.assert_(self._called) + self.assertTrue(self._called) if __name__ == '__main__': app = QApplication(sys.argv) diff --git a/tests/QtWidgets/bug_688.py b/tests/QtWidgets/bug_688.py index 3cd0e949..d622b33b 100644 --- a/tests/QtWidgets/bug_688.py +++ b/tests/QtWidgets/bug_688.py @@ -97,7 +97,7 @@ class BugTest(UsesQApplication): i = 0 while not b.atEnd(): self.assertEqual(b, items[i]) - self.assert_(b.parentFrame(), items[i].parentFrame()) + self.assertTrue(b.parentFrame(), items[i].parentFrame()) b.__iadd__(1) i += 1 @@ -106,7 +106,7 @@ class BugTest(UsesQApplication): i = 0 while i > 0: self.assertEqual(b, items[i]) - self.assert_(b.parentFrame(), items[i].parentFrame()) + self.assertTrue(b.parentFrame(), items[i].parentFrame()) b.__isub__(1) i -= 1 diff --git a/tests/QtWidgets/bug_750.py b/tests/QtWidgets/bug_750.py index b935da7a..055e982a 100644 --- a/tests/QtWidgets/bug_750.py +++ b/tests/QtWidgets/bug_750.py @@ -48,7 +48,7 @@ class TestQPainter(UsesQApplication): w._info = None QTimer.singleShot(300, w.show) self.app.exec_() - self.assert_(w._info) + self.assertTrue(w._info) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/bug_860.py b/tests/QtWidgets/bug_860.py index b1f8170d..f961a8ff 100644 --- a/tests/QtWidgets/bug_860.py +++ b/tests/QtWidgets/bug_860.py @@ -50,14 +50,14 @@ class MultipleSlotTest(UsesQApplication): checkboxMapper.mapped[str].connect(self.cb_changed) self._changed = False box.setChecked(True) - self.assert_(self._changed) + self.assertTrue(self._changed) def testSimpleSignal(self): box = QCheckBox('check me') box.stateChanged[int].connect(self.cb_changedVoid) self._changed = False box.setChecked(True) - self.assert_(self._changed) + self.assertTrue(self._changed) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/event_filter_test.py b/tests/QtWidgets/event_filter_test.py index 985228fc..e7e52564 100644 --- a/tests/QtWidgets/event_filter_test.py +++ b/tests/QtWidgets/event_filter_test.py @@ -61,7 +61,7 @@ class EventFilter(UsesQApplication): w.show() w.close() w = None - self.assert_(True) + self.assertTrue(True) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/grandparent_method_test.py b/tests/QtWidgets/grandparent_method_test.py index 6b5d2034..cbd561f5 100644 --- a/tests/QtWidgets/grandparent_method_test.py +++ b/tests/QtWidgets/grandparent_method_test.py @@ -44,7 +44,7 @@ class GrandParentMethod(UsesQApplication): def testMethod(self): obj = Dummy() obj.show() - self.assert_(obj.called) + self.assertTrue(obj.called) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/hashabletype_test.py b/tests/QtWidgets/hashabletype_test.py index 81a0fbff..21486b28 100644 --- a/tests/QtWidgets/hashabletype_test.py +++ b/tests/QtWidgets/hashabletype_test.py @@ -39,7 +39,7 @@ class HashableTest(UsesQApplication): h = {} obj = QTreeWidgetItem() h[obj] = 2 - self.assert_(h.get(obj), 2) + self.assertTrue(h.get(obj), 2) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/paint_event_test.py b/tests/QtWidgets/paint_event_test.py index e5139184..cbbe3acb 100644 --- a/tests/QtWidgets/paint_event_test.py +++ b/tests/QtWidgets/paint_event_test.py @@ -90,7 +90,7 @@ class PaintEventOverride(UsesQApplication): self.widget.killTimer(timer_id) - self.assert_(self.widget.paint_event_called) + self.assertTrue(self.widget.paint_event_called) self.assertEqual(self.widget.runs, 5) diff --git a/tests/QtWidgets/parent_method_test.py b/tests/QtWidgets/parent_method_test.py index 32d2d3b1..b3d88336 100644 --- a/tests/QtWidgets/parent_method_test.py +++ b/tests/QtWidgets/parent_method_test.py @@ -45,8 +45,8 @@ class TestParentType(UsesQApplication): # class. The method was returning the last C++ class in the hierarchy parent = Foo() w2 = QWidget(parent) - self.assert_(isinstance(w2.parentWidget(), Foo)) - self.assert_(isinstance(w2.parent(), Foo)) + self.assertTrue(isinstance(w2.parentWidget(), Foo)) + self.assertTrue(isinstance(w2.parent(), Foo)) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/python_properties_test.py b/tests/QtWidgets/python_properties_test.py index 50c9daa1..07770296 100644 --- a/tests/QtWidgets/python_properties_test.py +++ b/tests/QtWidgets/python_properties_test.py @@ -37,7 +37,7 @@ class Properties(unittest.TestCase): def testInstanceProperty(self): p = QtWidgets.QStyleOptionViewItem() - self.assert_(isinstance(p.locale, QtCore.QLocale)) + self.assertTrue(isinstance(p.locale, QtCore.QLocale)) if __name__ == '__main__': diff --git a/tests/QtWidgets/qaction_test.py b/tests/QtWidgets/qaction_test.py index e22be0d6..bbc8a520 100644 --- a/tests/QtWidgets/qaction_test.py +++ b/tests/QtWidgets/qaction_test.py @@ -42,14 +42,14 @@ class QPainterDrawText(UsesQApplication): self._called = False act.triggered.connect(self._cb) act.trigger() - self.assert_(self._called) + self.assertTrue(self._called) def testNewCtor(self): o = QWidget() self._called = False myAction = QAction("&Quit", o, triggered=self._cb) myAction.trigger() - self.assert_(self._called) + self.assertTrue(self._called) class SetShortcutTest(UsesQApplication): diff --git a/tests/QtWidgets/qapp_test.py b/tests/QtWidgets/qapp_test.py index 82f689df..63496f7d 100644 --- a/tests/QtWidgets/qapp_test.py +++ b/tests/QtWidgets/qapp_test.py @@ -36,7 +36,7 @@ class QAppPresence(unittest.TestCase): def testQApp(self): #QtGui.qApp variable is instance of QApplication - self.assert_(isinstance(qApp, QApplication)) + self.assertTrue(isinstance(qApp, QApplication)) def main(): app = QApplication([]) diff --git a/tests/QtWidgets/qdynamic_signal.py b/tests/QtWidgets/qdynamic_signal.py index 92c8a26e..cba2bc04 100644 --- a/tests/QtWidgets/qdynamic_signal.py +++ b/tests/QtWidgets/qdynamic_signal.py @@ -42,13 +42,13 @@ class DynamicSignalTest(UsesQApplication): dlg = QInputDialog() dlg.setInputMode(QInputDialog.TextInput) lst = dlg.children() - self.assert_(len(lst)) + self.assertTrue(len(lst)) obj = lst[0] self._called = False obj.destroyed[QObject].connect(self.cb) obj = None del dlg - self.assert_(self._called) + self.assertTrue(self._called) if __name__ == '__main__': diff --git a/tests/QtWidgets/qformlayout_test.py b/tests/QtWidgets/qformlayout_test.py index 443336f2..feb4b411 100644 --- a/tests/QtWidgets/qformlayout_test.py +++ b/tests/QtWidgets/qformlayout_test.py @@ -36,15 +36,15 @@ class QFormLayoutTest(UsesQApplication): def testGetItemPosition(self): formlayout = QFormLayout() row, role = formlayout.getItemPosition(0) - self.assert_(isinstance(row, int)) - self.assert_(isinstance(role, QFormLayout.ItemRole)) + self.assertTrue(isinstance(row, int)) + self.assertTrue(isinstance(role, QFormLayout.ItemRole)) self.assertEqual(row, -1) widget = QWidget() formlayout.addRow(widget) row, role = formlayout.getItemPosition(0) - self.assert_(isinstance(row, int)) - self.assert_(isinstance(role, QFormLayout.ItemRole)) + self.assertTrue(isinstance(row, int)) + self.assertTrue(isinstance(role, QFormLayout.ItemRole)) self.assertEqual(row, 0) self.assertEqual(role, QFormLayout.SpanningRole) @@ -52,14 +52,14 @@ class QFormLayoutTest(UsesQApplication): formlayout = QFormLayout() widget = QWidget() row, role = formlayout.getWidgetPosition(widget) - self.assert_(isinstance(row, int)) - self.assert_(isinstance(role, QFormLayout.ItemRole)) + self.assertTrue(isinstance(row, int)) + self.assertTrue(isinstance(role, QFormLayout.ItemRole)) self.assertEqual(row, -1) formlayout.addRow(widget) row, role = formlayout.getWidgetPosition(widget) - self.assert_(isinstance(row, int)) - self.assert_(isinstance(role, QFormLayout.ItemRole)) + self.assertTrue(isinstance(row, int)) + self.assertTrue(isinstance(role, QFormLayout.ItemRole)) self.assertEqual(row, 0) self.assertEqual(role, QFormLayout.SpanningRole) @@ -67,14 +67,14 @@ class QFormLayoutTest(UsesQApplication): formlayout = QFormLayout() layout = QFormLayout() row, role = formlayout.getLayoutPosition(layout) - self.assert_(isinstance(row, int)) - self.assert_(isinstance(role, QFormLayout.ItemRole)) + self.assertTrue(isinstance(row, int)) + self.assertTrue(isinstance(role, QFormLayout.ItemRole)) self.assertEqual(row, -1) formlayout.addRow(layout) row, role = formlayout.getLayoutPosition(layout) - self.assert_(isinstance(row, int)) - self.assert_(isinstance(role, QFormLayout.ItemRole)) + self.assertTrue(isinstance(row, int)) + self.assertTrue(isinstance(role, QFormLayout.ItemRole)) self.assertEqual(row, 0) self.assertEqual(role, QFormLayout.SpanningRole) diff --git a/tests/QtWidgets/qinputdialog_get_test.py b/tests/QtWidgets/qinputdialog_get_test.py index 9ea6b75e..3f94dcd4 100644 --- a/tests/QtWidgets/qinputdialog_get_test.py +++ b/tests/QtWidgets/qinputdialog_get_test.py @@ -34,18 +34,18 @@ from helper import UsesQApplication, TimedQApplication class TestInputDialog(TimedQApplication): def testGetDouble(self): - self.assertEquals(QtWidgets.QInputDialog.getDouble(None, "title", "label"), (0.0, False)) + self.assertEqual(QtWidgets.QInputDialog.getDouble(None, "title", "label"), (0.0, False)) def testGetInt(self): - self.assertEquals(QtWidgets.QInputDialog.getInt(None, "title", "label"), (0, False)) + self.assertEqual(QtWidgets.QInputDialog.getInt(None, "title", "label"), (0, False)) def testGetItem(self): (item, bool) = QtWidgets.QInputDialog.getItem(None, "title", "label", ["1", "2", "3"]) - self.assertEquals(str(item), "1") + self.assertEqual(str(item), "1") def testGetText(self): (text, bool) = QtWidgets.QInputDialog.getText(None, "title", "label") - self.assertEquals(str(text),"") + self.assertEqual(str(text),"") if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/qlistwidget_test.py b/tests/QtWidgets/qlistwidget_test.py index ce86a1dd..b89d2f77 100644 --- a/tests/QtWidgets/qlistwidget_test.py +++ b/tests/QtWidgets/qlistwidget_test.py @@ -41,31 +41,31 @@ class QListWidgetTest(UsesQApplication): item = QtWidgets.QListWidgetItem("item0") item.setData(QtCore.Qt.UserRole, o) #item._data = o - self.assert_(sys.getrefcount(o), 3) - self.assert_(sys.getrefcount(item), 2) + self.assertTrue(sys.getrefcount(o), 3) + self.assertTrue(sys.getrefcount(item), 2) lst.addItem(item) - self.assert_(sys.getrefcount(item), 3) + self.assertTrue(sys.getrefcount(item), 3) def checkCurrentItem(self, lst): item = lst.currentItem() - self.assert_(sys.getrefcount(item), 3) + self.assertTrue(sys.getrefcount(item), 3) def checkItemData(self, lst): item = lst.currentItem() o = item.data(QtCore.Qt.UserRole) - self.assert_(sys.getrefcount(o), 4) + self.assertTrue(sys.getrefcount(o), 4) self.assertEqual(o, item._data) - self.assert_(sys.getrefcount(o), 2) + self.assertTrue(sys.getrefcount(o), 2) def testConstructorWithParent(self): lst = QtWidgets.QListWidget() self.populateList(lst) self.checkCurrentItem(lst) i = lst.item(0) - self.assert_(sys.getrefcount(i), 3) + self.assertTrue(sys.getrefcount(i), 3) del lst - self.assert_(sys.getrefcount(i), 2) + self.assertTrue(sys.getrefcount(i), 2) del i def testIt(self): diff --git a/tests/QtWidgets/qmenuadd_test.py b/tests/QtWidgets/qmenuadd_test.py index e92cf704..39fa50a0 100644 --- a/tests/QtWidgets/qmenuadd_test.py +++ b/tests/QtWidgets/qmenuadd_test.py @@ -47,7 +47,7 @@ class QMenuAddAction(UsesQApplication): addNewAction = fileMenu.addAction("&Open...", self.openFile) addNewAction.trigger() - self.assertEquals(self.arg, ()) + self.assertEqual(self.arg, ()) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/qpushbutton_test.py b/tests/QtWidgets/qpushbutton_test.py index 1314059d..7039a8e3 100644 --- a/tests/QtWidgets/qpushbutton_test.py +++ b/tests/QtWidgets/qpushbutton_test.py @@ -62,7 +62,7 @@ class QPushButtonTest(UsesQApplication): self._clicked = False b.toggled[bool].connect(self.buttonCb) b.toggle() - self.assert_(self._clicked) + self.assertTrue(self._clicked) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/qshortcut_test.py b/tests/QtWidgets/qshortcut_test.py index 0d0a5969..0cf749eb 100644 --- a/tests/QtWidgets/qshortcut_test.py +++ b/tests/QtWidgets/qshortcut_test.py @@ -64,8 +64,8 @@ class QAppPresence(unittest.TestCase): self.scstd = MyShortcut(QtGui.QKeySequence.Copy, f, f.slot_of_copy) QtCore.QTimer.singleShot(0, self.init); self.qapp.exec_() - self.assertEquals(f.ok, True) - self.assertEquals(f.copy, True) + self.assertEqual(f.ok, True) + self.assertEqual(f.copy, True) def init(self): self.sc.emit_signal(); diff --git a/tests/QtWidgets/qsplitter_test.py b/tests/QtWidgets/qsplitter_test.py index bad7d4d6..f9066315 100644 --- a/tests/QtWidgets/qsplitter_test.py +++ b/tests/QtWidgets/qsplitter_test.py @@ -36,8 +36,8 @@ class QSplitterTest(UsesQApplication): def testGetRange(self): splitter = QSplitter() _min, _max = splitter.getRange(0) - self.assert_(isinstance(_min, int)) - self.assert_(isinstance(_max, int)) + self.assertTrue(isinstance(_min, int)) + self.assertTrue(isinstance(_max, int)) if __name__ == "__main__": unittest.main() diff --git a/tests/QtWidgets/qstring_qkeysequence_test.py b/tests/QtWidgets/qstring_qkeysequence_test.py index d730a87d..ed4c5ad0 100644 --- a/tests/QtWidgets/qstring_qkeysequence_test.py +++ b/tests/QtWidgets/qstring_qkeysequence_test.py @@ -53,7 +53,7 @@ class QStringQKeySequenceTest(UsesQApplication): action = QAction(None) action.setShortcut(keyseq) shortcut = action.shortcut() - self.assert_(isinstance(shortcut, QKeySequence)) + self.assertTrue(isinstance(shortcut, QKeySequence)) self.assertEqual(shortcut.toString(), keyseq) if __name__ == '__main__': diff --git a/tests/QtWidgets/qtabwidget_test.py b/tests/QtWidgets/qtabwidget_test.py index 81b36e21..b36310ed 100644 --- a/tests/QtWidgets/qtabwidget_test.py +++ b/tests/QtWidgets/qtabwidget_test.py @@ -46,7 +46,7 @@ class RemoveTabMethod(TimedQApplication): def testRemoveTabPresence(self): - self.assert_(getattr(self.tab, 'removeTab')) + self.assertTrue(getattr(self.tab, 'removeTab')) def testInsertTab(self): makeBug643(self.tab) diff --git a/tests/QtWidgets/qtoolbar_test.py b/tests/QtWidgets/qtoolbar_test.py index 08749e77..fc55d8bf 100644 --- a/tests/QtWidgets/qtoolbar_test.py +++ b/tests/QtWidgets/qtoolbar_test.py @@ -55,7 +55,7 @@ class AddActionText(UsesQApplication): self.toolbar.addAction('aaaa') self.assertEqual(len(self.toolbar.actions()), 1) action = self.toolbar.actions()[0] - self.assert_(isinstance(action, QAction)) + self.assertTrue(isinstance(action, QAction)) self.assertEqual(action.text(), 'aaaa') if __name__ == '__main__': diff --git a/tests/QtWidgets/qtoolbox_test.py b/tests/QtWidgets/qtoolbox_test.py index e2f3ac2a..ac6e590d 100644 --- a/tests/QtWidgets/qtoolbox_test.py +++ b/tests/QtWidgets/qtoolbox_test.py @@ -47,12 +47,12 @@ class OwnershipControl(UsesQApplication): # Was losing ownership of the widget. index = self.toolbox.addItem(QWidget(), 'item') item = self.toolbox.widget(index) - self.assert_(isinstance(item, QWidget)) + self.assertTrue(isinstance(item, QWidget)) def testAddItemWithIcon(self): index = self.toolbox.addItem(QWidget(), QIcon(), 'item') item = self.toolbox.widget(index) - self.assert_(isinstance(item, QWidget)) + self.assertTrue(isinstance(item, QWidget)) if __name__ == '__main__': diff --git a/tests/QtWidgets/qwidget_test.py b/tests/QtWidgets/qwidget_test.py index a16cd1bf..120215db 100644 --- a/tests/QtWidgets/qwidget_test.py +++ b/tests/QtWidgets/qwidget_test.py @@ -45,9 +45,9 @@ class QWidgetVisible(UsesQApplication): def testBasic(self): # Also related to bug #244, on existence of setVisible''' widget = QWidget() - self.assert_(not widget.isVisible()) + self.assertTrue(not widget.isVisible()) widget.setVisible(True) - self.assert_(widget.isVisible()) + self.assertTrue(widget.isVisible()) if __name__ == '__main__': diff --git a/tests/QtWidgets/reference_count_test.py b/tests/QtWidgets/reference_count_test.py index 940883c3..9fa51f16 100644 --- a/tests/QtWidgets/reference_count_test.py +++ b/tests/QtWidgets/reference_count_test.py @@ -64,7 +64,7 @@ class ReferenceCount(UsesQApplication): def beforeTest(self): points = [QPointF(0, 0), QPointF(100, 100), QPointF(0, 100)] pol = self.scene.addPolygon(QPolygonF(points)) - self.assert_(isinstance(pol, QGraphicsPolygonItem)) + self.assertTrue(isinstance(pol, QGraphicsPolygonItem)) self.wrp = weakref.ref(pol, pol_del) #refcount need be 3 because one ref for QGraphicsScene, and one to rect obj @@ -77,7 +77,7 @@ class ReferenceCount(UsesQApplication): self.beforeTest() rect = self.scene.addRect(10.0, 10.0, 10.0, 10.0) - self.assert_(isinstance(rect, QGraphicsRectItem)) + self.assertTrue(isinstance(rect, QGraphicsRectItem)) self.wrr = weakref.ref(rect, rect_del) diff --git a/tests/QtWidgets/returnquadruplesofnumbers_test.py b/tests/QtWidgets/returnquadruplesofnumbers_test.py index f1158574..45bcf7e9 100644 --- a/tests/QtWidgets/returnquadruplesofnumbers_test.py +++ b/tests/QtWidgets/returnquadruplesofnumbers_test.py @@ -56,34 +56,34 @@ class ReturnsQuadruplesOfNumbers(UsesQApplication): obj = GraphicsLayout() values = (10.0, 20.0, 30.0, 40.0) obj.setContentsMargins(*values) - self.assert_(self.compareTuples(obj.getContentsMargins(), values)) + self.assertTrue(self.compareTuples(obj.getContentsMargins(), values)) def testQGraphicsLayoutItemGetContentsMargins(self): obj = GraphicsLayoutItem() - self.assert_(self.compareTuples(obj.getContentsMargins(), (0.0, 0.0, 0.0, 0.0))) + self.assertTrue(self.compareTuples(obj.getContentsMargins(), (0.0, 0.0, 0.0, 0.0))) def testQWidgetGetContentsMargins(self): obj = QWidget() values = (10, 20, 30, 40) obj.setContentsMargins(*values) - self.assert_(self.compareTuples(obj.getContentsMargins(), values)) + self.assertTrue(self.compareTuples(obj.getContentsMargins(), values)) def testQLayoutGetContentsMargins(self): obj = Layout() values = (10, 20, 30, 40) obj.setContentsMargins(*values) - self.assert_(self.compareTuples(obj.getContentsMargins(), values)) + self.assertTrue(self.compareTuples(obj.getContentsMargins(), values)) def testQTextCursorSelectedTableCells(self): obj = QTextCursor() - self.assertEquals(obj.selectedTableCells(), (-1, -1, -1, -1)) + self.assertEqual(obj.selectedTableCells(), (-1, -1, -1, -1)) def testQPrinterGetPageMargins(self): # Bug #742 obj = QPrinter() values = (10.0, 20.0, 30.0, 40.0, QPrinter.Point) obj.setPageMargins(*values) - self.assert_(self.compareTuples(obj.getPageMargins(QPrinter.Point), values[:-1])) + self.assertTrue(self.compareTuples(obj.getPageMargins(QPrinter.Point), values[:-1])) if __name__ == "__main__": unittest.main() diff --git a/tests/QtWidgets/standardpixmap_test.py b/tests/QtWidgets/standardpixmap_test.py index 0281b9b6..dc93ba35 100644 --- a/tests/QtWidgets/standardpixmap_test.py +++ b/tests/QtWidgets/standardpixmap_test.py @@ -36,7 +36,7 @@ from helper import UsesQApplication class StandardPixmapTest(UsesQApplication): def testDefaultOptions(self): # Bug 253 pixmap = self.app.style().standardPixmap(QStyle.SP_DirClosedIcon) - self.assert_(isinstance(pixmap, QPixmap)) + self.assertTrue(isinstance(pixmap, QPixmap)) if __name__ == '__main__': unittest.main() diff --git a/tests/QtWidgets/virtual_protected_inheritance_test.py b/tests/QtWidgets/virtual_protected_inheritance_test.py index bcfb691c..b46ca8c8 100644 --- a/tests/QtWidgets/virtual_protected_inheritance_test.py +++ b/tests/QtWidgets/virtual_protected_inheritance_test.py @@ -84,7 +84,7 @@ class TimerEventTest(UsesQApplication): self.widget.killTimer(timer_id) - self.assert_(self.widget.runs >= self.widget.max_runs) + self.assertTrue(self.widget.runs >= self.widget.max_runs) if __name__ == '__main__': diff --git a/tests/QtWidgets/virtual_pure_override_test.py b/tests/QtWidgets/virtual_pure_override_test.py index c5099ae4..d7b82d78 100644 --- a/tests/QtWidgets/virtual_pure_override_test.py +++ b/tests/QtWidgets/virtual_pure_override_test.py @@ -69,7 +69,7 @@ class QGraphicsItemTest(UsesQApplication): view.show() QTimer.singleShot(1000, self.quit_app) self.app.exec_() - self.assert_(qgraphics_item_painted) + self.assertTrue(qgraphics_item_painted) if __name__ == '__main__': diff --git a/tests/QtXml/qdomdocument_test.py b/tests/QtXml/qdomdocument_test.py index 2b8da3f8..ca797445 100644 --- a/tests/QtXml/qdomdocument_test.py +++ b/tests/QtXml/qdomdocument_test.py @@ -66,7 +66,7 @@ class QDomDocumentTest(unittest.TestCase): def testQDomDocumentSetContentWithGoodXmlData(self): '''Sets valid xml as the QDomDocument contents.''' ok, errorStr, errorLine, errorColumn = self.dom.setContent(self.goodXmlData, True) - self.assert_(ok) + self.assertTrue(ok) self.assertEqual(errorStr, '') self.assertEqual(errorLine, 0) self.assertEqual(errorColumn, 0) @@ -75,9 +75,9 @@ class QDomDocumentTest(unittest.TestCase): '''Checks the QDomDocument elements for the valid xml contents.''' def checkAttribute(element, attribute, value): - self.assert_(isinstance(root, QDomElement)) + self.assertTrue(isinstance(root, QDomElement)) self.assertFalse(element.isNull()) - self.assert_(element.hasAttribute(attribute)) + self.assertTrue(element.hasAttribute(attribute)) self.assertEqual(element.attribute(attribute), value) ok, errorStr, errorLine, errorColumn = self.dom.setContent(self.goodXmlData, True) diff --git a/tests/QtXmlPatterns/import_test.py b/tests/QtXmlPatterns/import_test.py index 2b0f4605..5c9c3fe5 100644 --- a/tests/QtXmlPatterns/import_test.py +++ b/tests/QtXmlPatterns/import_test.py @@ -50,7 +50,7 @@ class QXmlPatternsTest(UsesQCoreApplication): schema = QXmlSchema() schema.load(buf) - self.assert_(schema.isValid()) + self.assertTrue(schema.isValid()) if __name__ == '__main__': diff --git a/tests/pysidetest/application_test.py b/tests/pysidetest/application_test.py index 14403f17..78628a55 100644 --- a/tests/pysidetest/application_test.py +++ b/tests/pysidetest/application_test.py @@ -35,7 +35,7 @@ from PySide2.QtWidgets import QApplication class QApplicationInstance(unittest.TestCase): def appDestroyed(self): - sefl.assert_(False) + sefl.assertTrue(False) def testInstanceObject(self): TestObject.createApp() diff --git a/tests/pysidetest/decoratedslot_test.py b/tests/pysidetest/decoratedslot_test.py index 9cd0c5da..6268f331 100644 --- a/tests/pysidetest/decoratedslot_test.py +++ b/tests/pysidetest/decoratedslot_test.py @@ -59,7 +59,7 @@ class DecoratedSlotTest(unittest.TestCase): receiver = Receiver() obj.staticMethodDouble.connect(receiver.slot) obj.emitStaticMethodDoubleSignal() - self.assert_(receiver.called) + self.assertTrue(receiver.called) if __name__ == '__main__': diff --git a/tests/pysidetest/homonymoussignalandmethod_test.py b/tests/pysidetest/homonymoussignalandmethod_test.py index f4d97ada..6be6245f 100644 --- a/tests/pysidetest/homonymoussignalandmethod_test.py +++ b/tests/pysidetest/homonymoussignalandmethod_test.py @@ -56,7 +56,7 @@ class HomonymousSignalAndMethodTest(unittest.TestCase): self.called = True self.obj.staticMethodDouble.connect(callback) self.obj.emitStaticMethodDoubleSignal() - self.assert_(self.called) + self.assertTrue(self.called) def testSignalNotCallable(self): self.assertRaises(TypeError, self.obj.justASignal) diff --git a/tests/pysidetest/list_signal_test.py b/tests/pysidetest/list_signal_test.py index 270e4ecf..1a130070 100644 --- a/tests/pysidetest/list_signal_test.py +++ b/tests/pysidetest/list_signal_test.py @@ -44,7 +44,7 @@ class ListConnectionTest(unittest.TestCase): self._child = None o.childrenChanged.connect(self.childrenChanged) o.addChild(c) - self.assertEquals(self._child.objectName(), "child") + self.assertEqual(self._child.objectName(), "child") if __name__ == '__main__': unittest.main() diff --git a/tests/pysidetest/notify_id.py b/tests/pysidetest/notify_id.py index 16c1e255..09226e6e 100644 --- a/tests/pysidetest/notify_id.py +++ b/tests/pysidetest/notify_id.py @@ -70,7 +70,7 @@ class NotifyIdSignal(unittest.TestCase): signalIndex = property.notifySignalIndex() signal = metaObject.method(signalIndex) signalName = signal.name() - self.assertEquals(signalName, "propChanged") + self.assertEqual(signalName, "propChanged") if __name__ == '__main__': unittest.main() diff --git a/tests/pysidetest/signalandnamespace_test.py b/tests/pysidetest/signalandnamespace_test.py index 928e9e8f..846e5b2b 100644 --- a/tests/pysidetest/signalandnamespace_test.py +++ b/tests/pysidetest/signalandnamespace_test.py @@ -41,26 +41,26 @@ class ModelViewTest(unittest.TestCase): o = PySideCPP.TestObjectWithNamespace(None) o.emitSignal.connect(self.callback) o.emitSignal.emit(o) - self.assert_(o == self._called) + self.assertTrue(o == self._called) self._called = None o = PySideCPP.TestObjectWithNamespace(None) o.emitSignal.connect(self.callback) o.callSignal(o) - self.assert_(o == self._called) + self.assertTrue(o == self._called) def testWithNamespace(self): self._called = None o = PySideCPP.TestObjectWithNamespace(None) o.emitSignalWithNamespace.connect(self.callback) o.emitSignalWithNamespace.emit(o) - self.assert_(o == self._called) + self.assertTrue(o == self._called) self._called = None o = PySideCPP.TestObjectWithNamespace(None) o.emitSignalWithNamespace.connect(self.callback) o.callSignalWithNamespace(o) - self.assert_(o == self._called) + self.assertTrue(o == self._called) def testWithoutNamespace1(self): @@ -68,26 +68,26 @@ class ModelViewTest(unittest.TestCase): o = TestObjectWithoutNamespace(None) o.emitSignal.connect(self.callback) o.emitSignal.emit(o) - self.assert_(o == self._called) + self.assertTrue(o == self._called) self._called = None o = TestObjectWithoutNamespace(None) o.emitSignal.connect(self.callback) o.callSignal(o) - self.assert_(o == self._called) + self.assertTrue(o == self._called) def testWithNamespace1(self): self._called = None o = TestObjectWithoutNamespace(None) o.emitSignalWithNamespace.connect(self.callback) o.emitSignalWithNamespace.emit(o) - self.assert_(o == self._called) + self.assertTrue(o == self._called) self._called = None o = TestObjectWithoutNamespace(None) o.emitSignalWithNamespace.connect(self.callback) o.callSignalWithNamespace(o) - self.assert_(o == self._called) + self.assertTrue(o == self._called) def testTypedfWithouNamespace(self): self._called = None diff --git a/tests/pysidetest/signalwithdefaultvalue_test.py b/tests/pysidetest/signalwithdefaultvalue_test.py index ab515056..8014d487 100644 --- a/tests/pysidetest/signalwithdefaultvalue_test.py +++ b/tests/pysidetest/signalwithdefaultvalue_test.py @@ -54,8 +54,8 @@ class SignalWithDefaultValueTest(unittest.TestCase): self.obj.signalWithDefaultValue.connect(callbackVoid) self.obj.signalWithDefaultValue[bool].connect(callbackBool) self.obj.emitSignalWithDefaultValue_void() - self.assert_(self.void_called) - self.assert_(self.bool_called) + self.assertTrue(self.void_called) + self.assertTrue(self.bool_called) def testConnectNewStyleEmitBoolSignal(self): def callbackVoid(): @@ -65,8 +65,8 @@ class SignalWithDefaultValueTest(unittest.TestCase): self.obj.signalWithDefaultValue.connect(callbackVoid) self.obj.signalWithDefaultValue[bool].connect(callbackBool) self.obj.emitSignalWithDefaultValue_bool() - self.assert_(self.void_called) - self.assert_(self.bool_called) + self.assertTrue(self.void_called) + self.assertTrue(self.bool_called) def testConnectOldStyleEmitVoidSignal(self): def callbackVoid(): @@ -76,8 +76,8 @@ class SignalWithDefaultValueTest(unittest.TestCase): QObject.connect(self.obj, SIGNAL('signalWithDefaultValue()'), callbackVoid) QObject.connect(self.obj, SIGNAL('signalWithDefaultValue(bool)'), callbackBool) self.obj.emitSignalWithDefaultValue_void() - self.assert_(self.void_called) - self.assert_(self.bool_called) + self.assertTrue(self.void_called) + self.assertTrue(self.bool_called) def testConnectOldStyleEmitBoolSignal(self): def callbackVoid(): @@ -87,8 +87,8 @@ class SignalWithDefaultValueTest(unittest.TestCase): QObject.connect(self.obj, SIGNAL('signalWithDefaultValue()'), callbackVoid) QObject.connect(self.obj, SIGNAL('signalWithDefaultValue(bool)'), callbackBool) self.obj.emitSignalWithDefaultValue_bool() - self.assert_(self.void_called) - self.assert_(self.bool_called) + self.assertTrue(self.void_called) + self.assertTrue(self.bool_called) if __name__ == '__main__': unittest.main() diff --git a/tests/pysidetest/version_test.py b/tests/pysidetest/version_test.py index e5f139d9..5901a56c 100644 --- a/tests/pysidetest/version_test.py +++ b/tests/pysidetest/version_test.py @@ -33,12 +33,12 @@ from PySide2 import __version_info__, __version__, QtCore class CheckForVariablesTest(unittest.TestCase): def testVesions(self): - self.assert_(__version_info__ >= (1, 0, 0)) - self.assert_(__version_info__ < (99, 99, 99)) - self.assert_(__version__) + self.assertTrue(__version_info__ >= (1, 0, 0)) + self.assertTrue(__version_info__ < (99, 99, 99)) + self.assertTrue(__version__) - self.assert_(QtCore.__version_info__ >= (4, 5, 0)) - self.assert_(QtCore.__version__) + self.assertTrue(QtCore.__version_info__ >= (4, 5, 0)) + self.assertTrue(QtCore.__version__) if __name__ == '__main__': unittest.main() diff --git a/tests/signals/args_dont_match_test.py b/tests/signals/args_dont_match_test.py index 1d1e1a7e..03d2ec32 100644 --- a/tests/signals/args_dont_match_test.py +++ b/tests/signals/args_dont_match_test.py @@ -42,7 +42,7 @@ class ArgsDontMatch(unittest.TestCase): QObject.connect(obj1, SIGNAL('the_signal(int, int, int)'), self.callback) obj1.emit(SIGNAL('the_signal(int, int, int)'), 1, 2, 3) - self.assert_(self.ok) + self.assertTrue(self.ok) diff --git a/tests/signals/bug_79.py b/tests/signals/bug_79.py index 0174276e..d0a6515f 100644 --- a/tests/signals/bug_79.py +++ b/tests/signals/bug_79.py @@ -62,7 +62,7 @@ class ConnectTest(unittest.TestCase): o.selectionModel().destroyed.disconnect(self.callback) gc.collect() if not skiptest: - self.assert_(abs(gettotalrefcount() - total) < 10) + self.assertTrue(abs(gettotalrefcount() - total) < 10) if __name__ == '__main__': diff --git a/tests/signals/disconnect_test.py b/tests/signals/disconnect_test.py index 44a79bbb..b17caa8e 100644 --- a/tests/signals/disconnect_test.py +++ b/tests/signals/disconnect_test.py @@ -81,7 +81,7 @@ class TestDisconnect(unittest.TestCase): return True obj.signalWithDefaultValue.connect(callback) obj.signalWithDefaultValue.emit() - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': diff --git a/tests/signals/lambda_gui_test.py b/tests/signals/lambda_gui_test.py index 3e06163a..dc6ef029 100644 --- a/tests/signals/lambda_gui_test.py +++ b/tests/signals/lambda_gui_test.py @@ -54,7 +54,7 @@ if hasQtGui: func = lambda: setattr(ctr, 'arg', True) QObject.connect(obj, SIGNAL('clicked()'), func) obj.click() - self.assert_(ctr.arg) + self.assertTrue(ctr.arg) QObject.disconnect(obj, SIGNAL('clicked()'), func) diff --git a/tests/signals/lambda_test.py b/tests/signals/lambda_test.py index 9f150313..9e602e72 100644 --- a/tests/signals/lambda_test.py +++ b/tests/signals/lambda_test.py @@ -52,7 +52,7 @@ class BasicCase(unittest.TestCase): QObject.connect(obj, SIGNAL('foo()'), lambda: setattr(obj, 'called', True)) obj.emit(SIGNAL('foo()')) - self.assert_(obj.called) + self.assertTrue(obj.called) def testSimplePythonSignal(self): #Connecting a lambda to a simple python signal witharguments @@ -76,7 +76,7 @@ class QtSigLambda(UsesQCoreApplication): lambda: setattr(dummy, 'called', True)) proc.start(sys.executable, ['-c', '""']) proc.waitForFinished() - self.assert_(dummy.called) + self.assertTrue(dummy.called) def testWithArgs(self): '''Connecting a lambda to a signal with arguments''' diff --git a/tests/signals/multiple_connections_gui_test.py b/tests/signals/multiple_connections_gui_test.py index 9ac23d4e..28e7867c 100644 --- a/tests/signals/multiple_connections_gui_test.py +++ b/tests/signals/multiple_connections_gui_test.py @@ -63,7 +63,7 @@ class MultipleSignalConnections(unittest.TestCase): emitter(*args) for rec in receivers: - self.assert_(rec.called) + self.assertTrue(rec.called) if hasQtGui: diff --git a/tests/signals/multiple_connections_test.py b/tests/signals/multiple_connections_test.py index d59391ab..39950da5 100644 --- a/tests/signals/multiple_connections_test.py +++ b/tests/signals/multiple_connections_test.py @@ -51,13 +51,13 @@ class MultipleSignalConnections(unittest.TestCase): args = tuple() for rec in receivers: rec.setUp() - self.assert_(QObject.connect(sender, SIGNAL(signal), rec.cb)) + self.assertTrue(QObject.connect(sender, SIGNAL(signal), rec.cb)) rec.args = tuple(args) emitter(*args) for rec in receivers: - self.assert_(rec.called) + self.assertTrue(rec.called) class PythonMultipleSlots(UsesQCoreApplication, MultipleSignalConnections): diff --git a/tests/signals/pysignal_test.py b/tests/signals/pysignal_test.py index e15fe149..a42793b0 100644 --- a/tests/signals/pysignal_test.py +++ b/tests/signals/pysignal_test.py @@ -126,7 +126,7 @@ class PythonSigSlot(unittest.TestCase): self.args = tuple() obj1.emit(SIGNAL('foo()'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) def testWithArgs(self): """Python signal and slots with integer arguments""" @@ -136,7 +136,7 @@ class PythonSigSlot(unittest.TestCase): self.args = (42,) obj1.emit(SIGNAL('foo(int)'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) def testDisconnect(self): @@ -148,7 +148,7 @@ class PythonSigSlot(unittest.TestCase): self.args = (42, ) obj1.emit(SIGNAL('foo(int)'), *self.args) - self.assert_(not self.called) + self.assertTrue(not self.called) if hasQtGui: @@ -205,10 +205,10 @@ if hasQtGui: self.widget.hide() QObject.connect(self.obj, SIGNAL('dummy()'), self.widget, SLOT('show()')) - self.assert_(not self.widget.isVisible()) + self.assertTrue(not self.widget.isVisible()) self.obj.emit(SIGNAL('dummy()')) - self.assert_(self.widget.isVisible()) + self.assertTrue(self.widget.isVisible()) if __name__ == '__main__': unittest.main() diff --git a/tests/signals/qobject_destroyed_test.py b/tests/signals/qobject_destroyed_test.py index bf289f3c..776702ee 100644 --- a/tests/signals/qobject_destroyed_test.py +++ b/tests/signals/qobject_destroyed_test.py @@ -44,7 +44,7 @@ class QObjectDestroyed(unittest.TestCase): obj = QObject() QObject.connect(obj, SIGNAL('destroyed()'), self.destroyed_cb) del obj - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': unittest.main() diff --git a/tests/signals/qobject_sender_test.py b/tests/signals/qobject_sender_test.py index d1a412c4..dfc8fac8 100644 --- a/tests/signals/qobject_sender_test.py +++ b/tests/signals/qobject_sender_test.py @@ -57,7 +57,7 @@ class ObjectSenderTest(unittest.TestCase): recv = Receiver() QObject.connect(sender, SIGNAL('foo()'), recv.callback) sender.emit(SIGNAL('foo()')) - self.assertEquals(sender, recv.the_sender) + self.assertEqual(sender, recv.the_sender) class ObjectSenderCheckOnReceiverTest(unittest.TestCase): '''Test case for QObject.sender() method, this one tests the equality on the Receiver object.''' @@ -67,7 +67,7 @@ class ObjectSenderCheckOnReceiverTest(unittest.TestCase): recv = Receiver() QObject.connect(sender, SIGNAL('foo()'), recv.callback) sender.emit(SIGNAL('foo()')) - self.assertEquals(sender, recv.the_sender) + self.assertEqual(sender, recv.the_sender) class ObjectSenderWithQAppTest(UsesQCoreApplication): '''Test case for QObject.sender() method with QApplication.''' @@ -79,7 +79,7 @@ class ObjectSenderWithQAppTest(UsesQCoreApplication): QObject.connect(sender, SIGNAL('timeout()'), recv.callback) sender.start(10) self.app.exec_() - self.assertEquals(sender, recv.the_sender) + self.assertEqual(sender, recv.the_sender) def testSenderCppSignalSingleShotTimer(self): recv = Receiver() @@ -93,7 +93,7 @@ class ObjectSenderWithQAppTest(UsesQCoreApplication): QObject.connect(sender, SIGNAL('timeout()'), recv.callback) sender.start(10) self.app.exec_() - self.assertEquals(sender, recv.the_sender) + self.assertEqual(sender, recv.the_sender) class ObjectSenderWithQAppCheckOnReceiverTest(UsesQCoreApplication): '''Test case for QObject.sender() method with QApplication.''' @@ -105,7 +105,7 @@ class ObjectSenderWithQAppCheckOnReceiverTest(UsesQCoreApplication): QObject.connect(sender, SIGNAL('timeout()'), recv.callback) sender.start(10) self.app.exec_() - self.assertEquals(sender, recv.the_sender) + self.assertEqual(sender, recv.the_sender) def testSenderCppSignalWithPythonExtendedClass(self): sender = ExtQTimer() @@ -113,7 +113,7 @@ class ObjectSenderWithQAppCheckOnReceiverTest(UsesQCoreApplication): QObject.connect(sender, SIGNAL('timeout()'), recv.callback) sender.start(10) self.app.exec_() - self.assertEquals(sender, recv.the_sender) + self.assertEqual(sender, recv.the_sender) if __name__ == '__main__': unittest.main() diff --git a/tests/signals/ref01_test.py b/tests/signals/ref01_test.py index 534842db..ad56ca45 100644 --- a/tests/signals/ref01_test.py +++ b/tests/signals/ref01_test.py @@ -47,7 +47,7 @@ class BoundAndUnboundSignalsTest(unittest.TestCase): def testBoundSignal(self): obj = QObject() self.assertNotEqual(type(obj.destroyed), Signal) - self.assert_(self.methods.issubset(dir(obj.destroyed))) + self.assertTrue(self.methods.issubset(dir(obj.destroyed))) if __name__ == '__main__': unittest.main() diff --git a/tests/signals/ref02_test.py b/tests/signals/ref02_test.py index 163662f4..7c16b2c6 100644 --- a/tests/signals/ref02_test.py +++ b/tests/signals/ref02_test.py @@ -56,7 +56,7 @@ class NativeSignalsTest(UsesQCoreApplication): self.timeline.start() self.app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) def testSignalWithoutArguments(self): @@ -68,7 +68,7 @@ class NativeSignalsTest(UsesQCoreApplication): self.timeline.start() self.app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': unittest.main() diff --git a/tests/signals/ref05_test.py b/tests/signals/ref05_test.py index f96911eb..2bd7d79c 100644 --- a/tests/signals/ref05_test.py +++ b/tests/signals/ref05_test.py @@ -66,7 +66,7 @@ class UserSlotTest(UsesQCoreApplication): self.app.exec_() - self.assert_(self.receiver.counter > 1) + self.assertTrue(self.receiver.counter > 1) if __name__ == '__main__': diff --git a/tests/signals/ref06_test.py b/tests/signals/ref06_test.py index 2af1eb59..ee2aa570 100644 --- a/tests/signals/ref06_test.py +++ b/tests/signals/ref06_test.py @@ -69,7 +69,7 @@ class SignaltoSignalTest(UsesQCoreApplication): self.app.exec_() - self.assert_(self.receiver.counter > 1) + self.assertTrue(self.receiver.counter > 1) if __name__ == '__main__': diff --git a/tests/signals/segfault_proxyparent_test.py b/tests/signals/segfault_proxyparent_test.py index 86829be7..b45e5357 100644 --- a/tests/signals/segfault_proxyparent_test.py +++ b/tests/signals/segfault_proxyparent_test.py @@ -71,14 +71,14 @@ class SegfaultCase(unittest.TestCase): QObject.connect(obj, SIGNAL('bar(int)'), self.callback) self.args = (33,) obj.emit(SIGNAL('bar(int)'), self.args[0]) - self.assert_(self.called) + self.assertTrue(self.called) del obj obj = Joe() QObject.connect(obj, SIGNAL('bar(int)'), self.callback) self.args = (33,) obj.emit(SIGNAL('bar(int)'), self.args[0]) - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': diff --git a/tests/signals/self_connect_test.py b/tests/signals/self_connect_test.py index ebe3bb2f..fde5fa88 100644 --- a/tests/signals/self_connect_test.py +++ b/tests/signals/self_connect_test.py @@ -45,9 +45,9 @@ class SelfConnect(UsesQApplication): button.connect(button, SIGNAL('clicked()'), SLOT('close()')) button.show() - self.assert_(button.isVisible()) + self.assertTrue(button.isVisible()) button.click() - self.assert_(not button.isVisible()) + self.assertTrue(not button.isVisible()) def testWindowButtonClickClose(self): button = QPushButton() @@ -55,9 +55,9 @@ class SelfConnect(UsesQApplication): window.connect(button, SIGNAL('clicked()'), SLOT('close()')) window.show() - self.assert_(window.isVisible()) + self.assertTrue(window.isVisible()) button.click() - self.assert_(not window.isVisible()) + self.assertTrue(not window.isVisible()) diff --git a/tests/signals/short_circuit_test.py b/tests/signals/short_circuit_test.py index b1bcc20e..a47385f5 100644 --- a/tests/signals/short_circuit_test.py +++ b/tests/signals/short_circuit_test.py @@ -55,7 +55,7 @@ class ShortCircuitSignals(unittest.TestCase): QObject.connect(obj1, SIGNAL('foo()'), self.callback) self.args = tuple() obj1.emit(SIGNAL('foo()'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) def testWithArgs(self): """Short circuit signal with integer arguments""" @@ -65,7 +65,7 @@ class ShortCircuitSignals(unittest.TestCase): self.args = (42,) obj1.emit(SIGNAL('foo(int)'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) def testMultipleArgs(self): """Short circuit signal with multiple arguments""" @@ -75,7 +75,7 @@ class ShortCircuitSignals(unittest.TestCase): self.args = (42,33,'char') obj1.emit(SIGNAL('foo(int,int,QString)'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) def testComplexArgs(self): """Short circuit signal with complex arguments""" @@ -85,7 +85,7 @@ class ShortCircuitSignals(unittest.TestCase): self.args = (42, obj1) obj1.emit(SIGNAL('foo(int,QObject*)'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': unittest.main() diff --git a/tests/signals/signal2signal_connect_test.py b/tests/signals/signal2signal_connect_test.py index f8d90c74..f088212d 100644 --- a/tests/signals/signal2signal_connect_test.py +++ b/tests/signals/signal2signal_connect_test.py @@ -83,7 +83,7 @@ class TestSignal2SignalConnect(unittest.TestCase): QObject.connect(self.forwarder, SIGNAL("forward()"), self.callback_noargs) del self.sender - self.assert_(self.called) + self.assertTrue(self.called) def testSignalWithOnePrimitiveTypeArgument(self): @@ -93,7 +93,7 @@ class TestSignal2SignalConnect(unittest.TestCase): self.callback_args) self.args = (19,) self.sender.emit(SIGNAL('mysignal(int)'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) def testSignalWithMultiplePrimitiveTypeArguments(self): @@ -103,7 +103,7 @@ class TestSignal2SignalConnect(unittest.TestCase): self.callback_args) self.args = (23, 29) self.sender.emit(SIGNAL('mysignal(int,int)'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) def testSignalWithOneStringArgument(self): @@ -113,7 +113,7 @@ class TestSignal2SignalConnect(unittest.TestCase): self.callback_args) self.args = ('myargument',) self.sender.emit(SIGNAL('mysignal(QString)'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) def testSignalWithOneQObjectArgument(self): @@ -126,7 +126,7 @@ class TestSignal2SignalConnect(unittest.TestCase): self.sender.setObjectName(obj_name) self.args = (obj_name, ) del self.sender - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': diff --git a/tests/signals/signal_autoconnect_test.py b/tests/signals/signal_autoconnect_test.py index 5cd9e819..e8ff6200 100644 --- a/tests/signals/signal_autoconnect_test.py +++ b/tests/signals/signal_autoconnect_test.py @@ -53,7 +53,7 @@ class AutoConnectionTest(unittest.TestCase): btn.setObjectName("button") QMetaObject.connectSlotsByName(win) btn.click() - self.assert_(win._method_called) + self.assertTrue(win._method_called) if __name__ == '__main__': unittest.main() diff --git a/tests/signals/signal_connectiontype_support_test.py b/tests/signals/signal_connectiontype_support_test.py index a7ccb467..50a24084 100644 --- a/tests/signals/signal_connectiontype_support_test.py +++ b/tests/signals/signal_connectiontype_support_test.py @@ -48,7 +48,7 @@ class TestConnectionTypeSupport(unittest.TestCase): self.args = tuple() obj1.emit(SIGNAL('foo()'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': diff --git a/tests/signals/signal_emission_gui_test.py b/tests/signals/signal_emission_gui_test.py index b44d64c4..b114351c 100644 --- a/tests/signals/signal_emission_gui_test.py +++ b/tests/signals/signal_emission_gui_test.py @@ -52,7 +52,7 @@ if hasQtGui: QObject.connect(button, SIGNAL('clicked()'), self.cb) self.args = tuple() button.emit(SIGNAL('clicked(bool)'), False) - self.assert_(self.called) + self.assertTrue(self.called) def testButtonClick(self): """Indirect qt signal emission using the QPushButton.click() method """ @@ -60,7 +60,7 @@ if hasQtGui: QObject.connect(button, SIGNAL('clicked()'), self.cb) self.args = tuple() button.click() - self.assert_(self.called) + self.assertTrue(self.called) if hasQtGui: @@ -80,14 +80,14 @@ if hasQtGui: QObject.connect(self.spin, SIGNAL('valueChanged(int)'), self.cb) self.args = [3] self.spin.emit(SIGNAL('valueChanged(int)'), *self.args) - self.assert_(self.called) + self.assertTrue(self.called) def testSpinBoxValueChangedImplicit(self): """Indirect qt signal emission using QSpinBox.setValue(int)""" QObject.connect(self.spin, SIGNAL('valueChanged(int)'), self.cb) self.args = [42] self.spin.setValue(self.args[0]) - self.assert_(self.called) + self.assertTrue(self.called) def atestSpinBoxValueChangedFewArgs(self): """Emission of signals with fewer arguments than needed""" diff --git a/tests/signals/signal_with_primitive_type_test.py b/tests/signals/signal_with_primitive_type_test.py index e0afaa66..cf107505 100644 --- a/tests/signals/signal_with_primitive_type_test.py +++ b/tests/signals/signal_with_primitive_type_test.py @@ -50,7 +50,7 @@ class SignalPrimitiveTypeTest(unittest.TestCase): tl = self.createTimeLine() tl.start() self._app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': unittest.main() diff --git a/tests/signals/static_metaobject_test.py b/tests/signals/static_metaobject_test.py index b1bd336b..ae16ce3b 100644 --- a/tests/signals/static_metaobject_test.py +++ b/tests/signals/static_metaobject_test.py @@ -55,7 +55,7 @@ class StaticMetaObjectTest(UsesQCoreApplication): o.connect(SIGNAL("foo()"), o2.mySlot) # SIGNAL foo create after connect - self.assert_(o.metaObject().indexOfSignal("foo()") > 0) + self.assertTrue(o.metaObject().indexOfSignal("foo()") > 0) # SIGNAL does not propagate to others objects of the same type self.assertEqual(o2.metaObject().indexOfSignal("foo()"), -1) |