2 files changed, 54 insertions, 0 deletions
diff --git a/tests/QtCore/CMakeLists.txt b/tests/QtCore/CMakeLists.txt
index 35fa7b97d..b5f59d474 100644
--- a/tests/QtCore/CMakeLists.txt
+++ b/tests/QtCore/CMakeLists.txt
@@ -22,6 +22,7 @@ PYSIDE_TEST(qfileinfo_test.py)
 PYSIDE_TEST(qfile_test.py)
 PYSIDE_TEST(qflags_test.py)
 PYSIDE_TEST(qhandle_test.py)
+PYSIDE_TEST(qinstallmsghandler_test.py)
 PYSIDE_TEST(qlinef_test.py)
 PYSIDE_TEST(qlocale_test.py)
 PYSIDE_TEST(qmetaobject_test.py)
diff --git a/tests/QtCore/qinstallmsghandler_test.py b/tests/QtCore/qinstallmsghandler_test.py
new file mode 100644
index 000000000..d76c6ceec
--- /dev/null
+++ b/tests/QtCore/qinstallmsghandler_test.py
@@ -0,0 +1,53 @@
+
+'''Test cases for qInstallMsgHandler'''
+
+import unittest
+import sys
+
+from PySide.QtCore import *
+
+param = []
+
+def handler(msgt, msg):
+    global param
+    param = [msgt, msg]
+
+def handleruseless(msgt, msg):
+    pass
+
+class QInstallMsgHandlerTest(unittest.TestCase):
+
+    def tearDown(self):
+        # Ensure that next test will have a clear environment
+        qInstallMsgHandler(None)
+
+    def testNone(self):
+        ret = qInstallMsgHandler(None)
+        self.assertEqual(ret, None)
+
+    def testRet(self):
+        ret = qInstallMsgHandler(None)
+        self.assertEqual(ret, None)
+        refcount = sys.getrefcount(handleruseless)
+        retNone = qInstallMsgHandler(handleruseless)
+        self.assertEqual(sys.getrefcount(handleruseless), refcount + 1)
+        rethandler = qInstallMsgHandler(None)
+        self.assertEqual(rethandler, handleruseless)
+        del rethandler
+        self.assertEqual(sys.getrefcount(handleruseless), refcount)
+
+    def testHandler(self):
+        rethandler = qInstallMsgHandler(handler)
+        qDebug("Test Debug")
+        self.assertEqual(param[0], QtDebugMsg)
+        self.assertEqual(param[1], "Test Debug")
+        qWarning("Test Warning")
+        self.assertEqual(param[0], QtWarningMsg)
+        self.assertEqual(param[1], "Test Warning")
+        qCritical("Test Critical")
+        self.assertEqual(param[0], QtCriticalMsg)
+        self.assertEqual(param[1], "Test Critical")
+
+if __name__ == '__main__':
+    unittest.main()
+