Merge lp:~tiagosh/messaging-app/rtm-14.09-fix-1382623 into lp:messaging-app/rtm-14.09

[Tiago Salem Herrmann]

Read text property from url-dispatcher.

Read text property from url-dispatcher.

[Gustavo Pichorim Boiko (boiko)]

155 + parameter,
and
161 + parameter,

This extra parameter breaks autopilot test running on krillin:
TypeError: launch_upstart_application() takes from 2 to 3 positional arguments but 4 were given

review: Needs Fixing

[lp:~tiagosh/messaging-app/rtm-14.09-fix-1382623]

197. By Tiago Salem Herrmann on 2014-12-18

launch_upstart_application() does not take more than one argument.

198. By Tiago Salem Herrmann on 2014-12-18

remove --test-contacts

=== modified file 'src/messagingapplication.cpp'
--- src/messagingapplication.cpp	2014-07-01 18:08:32 +0000
+++ src/messagingapplication.cpp	2014-12-18 16:57:17 +0000
@@ -20,6 +20,7 @@
 
 #include <QDir>
 #include <QUrl>
+#include <QUrlQuery>
 #include <QDebug>
 #include <QStringList>
 #include <QQuickItem>
@@ -36,6 +37,7 @@
 #include <QVersitReader>
 
 using namespace QtVersit;
+#define Pair QPair<QString,QString>
 
 static void printUsage(const QStringList& arguments)
 {
@@ -184,10 +186,18 @@
         return;
     }
 
+    QString text;
     QUrl url(arg);
     QString scheme = url.scheme();
     // Remove the first "/"
     QString value = url.path().right(url.path().length() -1);
+    QUrlQuery query(url);
+    Q_FOREACH(const Pair &item, query.queryItems()) {
+        if (item.first == "text") {
+            text = item.second;
+            break;
+        }
+    }
 
     QQuickItem *mainView = m_view->rootObject();
     if (!mainView) {
@@ -196,7 +206,7 @@
 
     if (scheme == "message") {
         if (!value.isEmpty()) {
-            QMetaObject::invokeMethod(mainView, "startChat", Q_ARG(QVariant, value));
+            QMetaObject::invokeMethod(mainView, "startChat", Q_ARG(QVariant, value), Q_ARG(QVariant, text));
         } else {
             QMetaObject::invokeMethod(mainView, "startNewMessage");
         }

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-10-07 16:57:27 +0000
+++ src/qml/Messages.qml	2014-12-18 16:57:17 +0000
@@ -796,6 +796,7 @@
 
             TextArea {
                 id: messageTextArea
+                objectName: "messageTextArea"
                 anchors {
                     top: attachments.count == 0 ? textEntry.top : attachmentThumbnails.bottom
                     left: parent.left

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2014-09-17 15:35:10 +0000
+++ src/qml/messaging-app.qml	2014-12-18 16:57:17 +0000
@@ -136,10 +136,11 @@
         mainStack.currentPage.showBottomEdgePage(Qt.resolvedUrl("Messages.qml"))
     }
 
-    function startChat(phoneNumber) {
+    function startChat(phoneNumber, text) {
         var properties = {}
         var participants = [phoneNumber]
         properties["participants"] = participants
+        properties["text"] = text
         emptyStack()
         if (phoneNumber === "") {
             return;

=== modified file 'tests/autopilot/messaging_app/emulators.py'
--- tests/autopilot/messaging_app/emulators.py	2014-09-10 18:14:43 +0000
+++ tests/autopilot/messaging_app/emulators.py	2014-12-18 16:57:17 +0000
@@ -117,8 +117,9 @@
     def get_newmessage_textarea(self):
         """Return TextArea with blank objectName"""
 
-        return self.get_messages_page().select_single('TextArea',
-                                                      objectName='')
+        return self.get_messages_page().select_single(
+            'TextArea',
+            objectName='messageTextArea')
 
     def get_send_button(self):
         """Return Button with text Send"""
@@ -481,6 +482,10 @@
             messages.append((date, text))
         return messages
 
+    def get_text_area_text(self):
+        return self.wait_select_single(
+            'TextArea', objectName='messageTextArea').text
+
 
 class ListItemWithActions(_common.UbuntuUIToolkitCustomProxyObjectBase):
 

=== modified file 'tests/autopilot/messaging_app/tests/__init__.py'
--- tests/autopilot/messaging_app/tests/__init__.py	2014-07-15 16:32:16 +0000
+++ tests/autopilot/messaging_app/tests/__init__.py	2014-12-18 16:57:17 +0000
@@ -37,7 +37,10 @@
 
     # Don't use keyboard on desktop
     if model() == 'Desktop':
-        subprocess.call(['/sbin/initctl', 'stop', 'maliit-server'])
+        try:
+            subprocess.call(['/sbin/initctl', 'stop', 'maliit-server'])
+        except:
+            pass
 
     if model() == 'Desktop':
         scenarios = [
@@ -50,36 +53,36 @@
 
     local_location = '../../src/messaging-app'
 
-    def setUp(self):
+    def setUp(self, parameter=""):
         self.pointing_device = Pointer(self.input_device_class.create())
         super(MessagingAppTestCase, self).setUp()
 
         subprocess.call(['pkill', 'messaging-app'])
 
         if os.path.exists(self.local_location):
-            self.launch_test_local()
+            self.launch_test_local(parameter)
         else:
-            self.launch_test_installed()
+            self.launch_test_installed(parameter)
 
         self.assertThat(self.main_view.visible, Eventually(Equals(True)))
 
-    def launch_test_local(self):
+    def launch_test_local(self, parameter):
         self.app = self.launch_test_application(
             self.local_location,
-            '--test-contacts',
+            parameter,
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
-    def launch_test_installed(self):
+    def launch_test_installed(self, parameter):
         if model() == 'Desktop':
             self.app = self.launch_test_application(
                 'messaging-app',
-                '--test-contacts',
+                parameter,
                 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
         else:
             self.app = self.launch_upstart_application(
                 'messaging-app',
-                '--test-contacts',
+                parameter,
                 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     @property

=== modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
--- tests/autopilot/messaging_app/tests/test_messaging.py	2014-09-19 21:50:28 +0000
+++ tests/autopilot/messaging_app/tests/test_messaging.py	2014-12-18 16:57:17 +0000
@@ -342,3 +342,18 @@
         _, remaining_message_text = remaining_messages[0]
         self.assertEqual(
             remaining_message_text, self.messages[0])
+
+
+class MessagingTestCaseWithArgument(MessagingAppTestCase):
+
+    def setUp(self):
+        test_setup = fixture_setup.MessagingTestEnvironment()
+        self.useFixture(test_setup)
+
+        super(MessagingTestCaseWithArgument, self).setUp(
+            parameter="message:///5555559876?text=text%20message")
+
+    def test_launch_app_with_predefined_text(self):
+        self.messages_view = self.main_view.select_single(
+            emulators.Messages,
+            text='text message')