jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed unittest to work with python3.

Browse source
This commit is contained in:
Renato Filho 2011-10-07 15:03:53 -03:00 • committed by Hugo Parente Lima
commit 401651e26c
2 changed files with 91 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/QtCore/bug_462.py
View file

@ -43,6 +43,4 @@ class CheckForEventsTypes(unittest.TestCase):
o.app = None o.app = None
if __name__ == '__main__': if __name__ == '__main__':
print int(QEvent.User) unittest.main()
val = QEvent.User + 100
#unittest.main()

29
tests/QtWebKit/bug_959.py
View file

@ -4,36 +4,43 @@ from PySide.QtWebKit import QWebView
import unittest import unittest
from helper import UsesQApplication from helper import UsesQApplication
class JSFuncs(QObject):
functionID = -1 functionID = -1
class JSFuncs(QObject):
@Slot(str,result=str) @Slot(str,result=str)
def slot_str_str(self, x): def slot_str_str(self, x):
JSFuncs.functionID = 0 global functionID
functionID = 0
return x.upper() return x.upper()
@Slot(str,result='QVariant') @Slot(str,result='QVariant')
def slot_str_list(self, x): def slot_str_list(self, x):
JSFuncs.functionID = 1 global functionID
functionID = 1
return [x, x] return [x, x]
@Slot('QStringList',result=str) @Slot('QStringList',result=str)
def slot_strlist_str(self, x): def slot_strlist_str(self, x):
JSFuncs.functionID = 2 global functionID
functionID = 2
return x[-1] return x[-1]
@Slot('QVariant',result=str) @Slot('QVariant',result=str)
def slot_variant_str(self, x): def slot_variant_str(self, x):
JSFuncs.functionID = 3 global functionID
functionID = 3
return str(x) return str(x)
@Slot('QVariantList',result=str) @Slot('QVariantList',result=str)
def slot_variantlist_str(self, x): def slot_variantlist_str(self, x):
JSFuncs.functionID = 4 global functionID
functionID = 4
return str(x[-1]) return str(x[-1])
@Slot('QVariantMap',result=str) @Slot('QVariantMap',result=str)
def slot_variantmap_str(self, x): def slot_variantmap_str(self, x):
JSFuncs.functionID = 5 global functionID
functionID = 5
return str(x["foo"]) return str(x["foo"])
@ -54,9 +61,10 @@ class TestJsCall(UsesQApplication):
super(TestJsCall, self).setUpClass() super(TestJsCall, self).setUpClass()
def createInstance(self): def createInstance(self):
global functionID
self._view = QWebView() self._view = QWebView()
self._jsfuncs = JSFuncs() self._jsfuncs = JSFuncs()
JSFuncs.functionID = -1 functionID = -1
self._view.page().mainFrame().addToJavaScriptWindowObject("jsfuncs", self._jsfuncs) self._view.page().mainFrame().addToJavaScriptWindowObject("jsfuncs", self._jsfuncs)
self._view.loadFinished[bool].connect(self.onLoadFinished) self._view.loadFinished[bool].connect(self.onLoadFinished)
self._view.load(PAGE_DATA % FUNCTIONS_LIST[self._functionID]) self._view.load(PAGE_DATA % FUNCTIONS_LIST[self._functionID])
@ -68,8 +76,9 @@ class TestJsCall(UsesQApplication):
self.app.exec_() self.app.exec_()
def onLoadFinished(self, result): def onLoadFinished(self, result):
self.assertEqual(self._functionID, JSFuncs.functionID) global functionID
if self._functionID == len(FUNCTIONS_LIST) - 1: self.assertEqual(self._functionID, functionID)
if self._functionID == (len(FUNCTIONS_LIST) - 1):
QTimer.singleShot(300, self.app.quit) QTimer.singleShot(300, self.app.quit)
else: else:
#new test #new test