Created unit test for bug #726.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Lauro Moura <lauro.neto@openbossa.org>

4 files changed, 123 insertions, 0 deletions

diff --git a/tests/QtDeclarative/CMakeLists.txt b/tests/QtDeclarative/CMakeLists.txt
index 84bc4957b..01a417262 100644
--- a/tests/QtDeclarative/CMakeLists.txt
+++ b/tests/QtDeclarative/CMakeLists.txt
@@ -1,6 +1,7 @@
 PYSIDE_TEST(bug_451.py)
 PYSIDE_TEST(bug_456.py)
 PYSIDE_TEST(bug_557.py)
+PYSIDE_TEST(bug_726.py)
 PYSIDE_TEST(qdeclarativenetwork_test.py)
 PYSIDE_TEST(qdeclarativeview_test.py)
 PYSIDE_TEST(connect_python_qml.py)
diff --git a/tests/QtDeclarative/bug_726.py b/tests/QtDeclarative/bug_726.py
new file mode 100644
index 000000000..fa18aac1e
--- /dev/null
+++ b/tests/QtDeclarative/bug_726.py
@@ -0,0 +1,41 @@
+from PySide import QtCore, QtGui, QtDeclarative
+from helper import adjust_filename, TimedQApplication
+import unittest
+
+class ProxyObject(QtCore.QObject):
+    def __init__(self):
+        super(ProxyObject,self).__init__()
+        self._o = None
+        self._receivedName = ""
+
+    @QtCore.Slot(result='QObject*')
+    def getObject(self):
+        if self._o:
+            return self._o
+
+        self._o = QtCore.QObject()
+        self._o.setObjectName("PySideObject")
+        return self._o
+
+    @QtCore.Slot(str)
+    def receivedObject(self, name):
+        self._receivedName = name
+ 
+
+class TestConnectionWithInvalidSignature(TimedQApplication):
+
+    def testSlotRetur(self):
+        view = QtDeclarative.QDeclarativeView()
+        proxy = ProxyObject()
+
+        context = view.rootContext()
+        context.setContextProperty("proxy", proxy)
+        view.setSource(QtCore.QUrl.fromLocalFile(adjust_filename('bug_726.qml', __file__)))
+        root = view.rootObject()
+        button = root.findChild(QtCore.QObject, "buttonMouseArea")
+        view.show()
+        button.entered.emit()
+        self.assertEqual(proxy._receivedName, "PySideObject")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/bug_726.qml b/tests/QtDeclarative/bug_726.qml
new file mode 100644
index 000000000..27cf59fc0
--- /dev/null
+++ b/tests/QtDeclarative/bug_726.qml
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: PySide Team (pyside@openbossa.org)
+**
+** This file is part of the examples of PySide: Python for Qt.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Rectangle {
+    id: page
+
+    width: 500; height: 200
+    color: "lightgray"
+
+    Rectangle {
+        id: button
+        width: 150; height: 40
+        color: "darkgray"
+        anchors.horizontalCenter: page.horizontalCenter
+        y: 120
+        MouseArea {
+            id: buttonMouseArea
+            objectName: "buttonMouseArea"
+            anchors.fill: parent
+            onEntered: {
+                    proxy.receivedObject(proxy.getObject().objectName)
+            }
+        }
+        Text {
+            id: buttonText
+                text: "Press me!"
+            anchors.horizontalCenter: button.horizontalCenter
+            anchors.verticalCenter: button.verticalCenter
+            font.pointSize: 16;
+        }
+    }
+}
diff --git a/tests/signals/decorators_test.py b/tests/signals/decorators_test.py
index b25e12994..da9c1cae4 100644
--- a/tests/signals/decorators_test.py
+++ b/tests/signals/decorators_test.py
@@ -32,6 +32,10 @@ class MyObject(QObject):
     def mySlot5(self):
         self._slotCalledCount = self._slotCalledCount + 1
 
+    @Slot(result=QObject)
+    def mySlot6(self):
+        self._slotCalledCount = self._slotCalledCount + 1
+
 class StaticMetaObjectTest(unittest.TestCase):
 
     def testSignalPropagation(self):
@@ -56,6 +60,12 @@ class StaticMetaObjectTest(unittest.TestCase):
         m = mo.method(i)
         self.assertEqual(m.typeName(), "int")
 
+    def testResultObject(self):
+        o = MyObject()
+        mo = o.metaObject()
+        i = mo.indexOfSlot('mySlot6()')
+        m = mo.method(i)
+        self.assertEqual(m.typeName(), "QObject*")
 
 class SlotWithoutArgs(unittest.TestCase):