Fixes QPixmap.loadFromData method and extends QPixmap test cases.

Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Bruno Araújo <bruno.araujo@openbossa.org>

2 files changed, 15 insertions, 1 deletions

diff --git a/tests/qtgui/qpixmap_test.py b/tests/qtgui/qpixmap_test.py
index bc287f369..64264109b 100644
--- a/tests/qtgui/qpixmap_test.py
+++ b/tests/qtgui/qpixmap_test.py
@@ -1,5 +1,6 @@
 import unittest
 
+import os
 from helper import UsesQApplication
 from PySide.QtGui import *
 from PySide.QtCore import *
@@ -17,12 +18,25 @@ class QPixmapTest(UsesQApplication):
     def testQStringConstructor(self):
         pixmap = QPixmap(QString("Testing!"))
 
-    def testQVariantConstructor(self):
+    def testQVariantConstructor2(self):
         v = QVariant(QPixmap())
         pixmap2 = QPixmap(v)
         v = QVariant(QImage())
         pixmap2 = QPixmap(v)
 
+    def testQPixmapLoadFromDataWithQFile(self):
+        f = QFile(os.path.join(os.path.dirname(__file__), 'sample.png'))
+        self.assert_(f.open(QIODevice.ReadOnly))
+        data = f.read(f.size())
+        f.close()
+        pixmap = QPixmap()
+        self.assert_(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))
+
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/tests/qtgui/sample.png b/tests/qtgui/sample.png
new file mode 100644
index 000000000..60450f0dc
--- /dev/null
+++ b/tests/qtgui/sample.png