summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2011-10-07 15:03:53 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2011-10-07 18:00:15 -0300
commit6ec8f68ed2d388252ef773ab908ca827fb193c23 (patch)
tree6f643c59154877e3858ae4a74aa9cb9126a47c46
parentd41aff3062adbe3981f65575b544d4c9fd98689d (diff)
downloadpyside-6ec8f68ed2d388252ef773ab908ca827fb193c23.tar.gz
pyside-6ec8f68ed2d388252ef773ab908ca827fb193c23.tar.xz
pyside-6ec8f68ed2d388252ef773ab908ca827fb193c23.zip
Fixed unittest to work with python3.
-rw-r--r--tests/QtCore/bug_462.py4
-rw-r--r--tests/QtWebKit/bug_959.py171
2 files changed, 91 insertions, 84 deletions
diff --git a/tests/QtCore/bug_462.py b/tests/QtCore/bug_462.py
index 7f66234..47ab57a 100644
--- a/tests/QtCore/bug_462.py
+++ b/tests/QtCore/bug_462.py
@@ -43,6 +43,4 @@ class CheckForEventsTypes(unittest.TestCase):
o.app = None
if __name__ == '__main__':
- print int(QEvent.User)
- val = QEvent.User + 100
- #unittest.main()
+ unittest.main()
diff --git a/tests/QtWebKit/bug_959.py b/tests/QtWebKit/bug_959.py
index 3f40c9a..e3cc36c 100644
--- a/tests/QtWebKit/bug_959.py
+++ b/tests/QtWebKit/bug_959.py
@@ -1,81 +1,90 @@
-from PySide.QtCore import QObject, Slot, QTimer
-from PySide.QtWebKit import QWebView
-
-import unittest
-from helper import UsesQApplication
-
-class JSFuncs(QObject):
- functionID = -1
- @Slot(str,result=str)
- def slot_str_str(self, x):
- JSFuncs.functionID = 0
- return x.upper()
-
- @Slot(str,result='QVariant')
- def slot_str_list(self, x):
- JSFuncs.functionID = 1
- return [x, x]
-
- @Slot('QStringList',result=str)
- def slot_strlist_str(self, x):
- JSFuncs.functionID = 2
- return x[-1]
-
- @Slot('QVariant',result=str)
- def slot_variant_str(self, x):
- JSFuncs.functionID = 3
- return str(x)
-
- @Slot('QVariantList',result=str)
- def slot_variantlist_str(self, x):
- JSFuncs.functionID = 4
- return str(x[-1])
-
- @Slot('QVariantMap',result=str)
- def slot_variantmap_str(self, x):
- JSFuncs.functionID = 5
- return str(x["foo"])
-
-
-
-PAGE_DATA = "data:text/html,<!doctype html><html><body onload='%s'></body></html>"
-FUNCTIONS_LIST = ['jsfuncs.slot_str_str("hello")',
- 'jsfuncs.slot_str_list("hello")',
- 'jsfuncs.slot_strlist_str(["hello","world"])',
- 'jsfuncs.slot_variant_str("hello")',
- 'jsfuncs.slot_variantlist_str(["hello","world"])',
- 'jsfuncs.slot_variantmap_str({"foo": "bar"})']
-
-
-class TestJsCall(UsesQApplication):
-
- @classmethod
- def setUpClass(self):
- super(TestJsCall, self).setUpClass()
-
- def createInstance(self):
- self._view = QWebView()
- self._jsfuncs = JSFuncs()
- JSFuncs.functionID = -1
- self._view.page().mainFrame().addToJavaScriptWindowObject("jsfuncs", self._jsfuncs)
- self._view.loadFinished[bool].connect(self.onLoadFinished)
- self._view.load(PAGE_DATA % FUNCTIONS_LIST[self._functionID])
- self._view.show()
-
- def testJsCall(self):
- self._functionID = 0
- self.createInstance()
- self.app.exec_()
-
- def onLoadFinished(self, result):
- self.assertEqual(self._functionID, JSFuncs.functionID)
- if self._functionID == len(FUNCTIONS_LIST) - 1:
- QTimer.singleShot(300, self.app.quit)
- else:
- #new test
- self._functionID += 1
- self.createInstance()
-
-
-if __name__ == "__main__":
- unittest.main()
+from PySide.QtCore import QObject, Slot, QTimer
+from PySide.QtWebKit import QWebView
+
+import unittest
+from helper import UsesQApplication
+
+functionID = -1
+
+class JSFuncs(QObject):
+ @Slot(str,result=str)
+ def slot_str_str(self, x):
+ global functionID
+ functionID = 0
+ return x.upper()
+
+ @Slot(str,result='QVariant')
+ def slot_str_list(self, x):
+ global functionID
+ functionID = 1
+ return [x, x]
+
+ @Slot('QStringList',result=str)
+ def slot_strlist_str(self, x):
+ global functionID
+ functionID = 2
+ return x[-1]
+
+ @Slot('QVariant',result=str)
+ def slot_variant_str(self, x):
+ global functionID
+ functionID = 3
+ return str(x)
+
+ @Slot('QVariantList',result=str)
+ def slot_variantlist_str(self, x):
+ global functionID
+ functionID = 4
+ return str(x[-1])
+
+ @Slot('QVariantMap',result=str)
+ def slot_variantmap_str(self, x):
+ global functionID
+ functionID = 5
+ return str(x["foo"])
+
+
+
+PAGE_DATA = "data:text/html,<!doctype html><html><body onload='%s'></body></html>"
+FUNCTIONS_LIST = ['jsfuncs.slot_str_str("hello")',
+ 'jsfuncs.slot_str_list("hello")',
+ 'jsfuncs.slot_strlist_str(["hello","world"])',
+ 'jsfuncs.slot_variant_str("hello")',
+ 'jsfuncs.slot_variantlist_str(["hello","world"])',
+ 'jsfuncs.slot_variantmap_str({"foo": "bar"})']
+
+
+class TestJsCall(UsesQApplication):
+
+ @classmethod
+ def setUpClass(self):
+ super(TestJsCall, self).setUpClass()
+
+ def createInstance(self):
+ global functionID
+ self._view = QWebView()
+ self._jsfuncs = JSFuncs()
+ functionID = -1
+ self._view.page().mainFrame().addToJavaScriptWindowObject("jsfuncs", self._jsfuncs)
+ self._view.loadFinished[bool].connect(self.onLoadFinished)
+ self._view.load(PAGE_DATA % FUNCTIONS_LIST[self._functionID])
+ self._view.show()
+
+ def testJsCall(self):
+ self._functionID = 0
+ self.createInstance()
+ self.app.exec_()
+
+ def onLoadFinished(self, result):
+ global functionID
+ self.assertEqual(self._functionID, functionID)
+ if self._functionID == (len(FUNCTIONS_LIST) - 1):
+ QTimer.singleShot(300, self.app.quit)
+ else:
+ #new test
+ self._functionID += 1
+ self.createInstance()
+
+
+if __name__ == "__main__":
+ unittest.main()