Merge lp:~abreu-alexandre/unity-webapps-qml/fix-autopilot-tests-and-handle-local-apps into lp:unity-webapps-qml

[Alexandre Abreu]

Simplify/fix autopilot tests; Handle better local usage of webapps component (for local apps)

Simplify/fix autopilot tests; Handle better local usage of webapps component (for local apps)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-amd64-ci/40
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-armhf-ci/40/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-webapps-qml-ci/40/rebuild

review: Needs Fixing (continuous-integration)

[David Barth (dbarth)]

Just reacting to the following part:

//FIXME: think of a better way to handle desktop/phone specifics
if ! defined(Q_OS_LINUX) || ! defined(Q_PROCESSOR_X86)

that is spread across functions, you should define another macro and put the temporary detection logic above in that macro instead.

Note: it seems that the ARM build is already complaining about it

[lp:~abreu-alexandre/unity-webapps-qml/fix-autopilot-tests-and-handle-local-apps]

56. By Alexandre Abreu on 2013-09-06

Simplify/fix autopilot tests; Handle better local usage of webapps component (for local apps)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-armhf-ci/41

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-webapps-qml-ci/41/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2013-08-31 14:20:57 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2013-09-06 12:56:00 +0000
@@ -380,9 +380,7 @@
 
         return {
             init: function (params) {
-                console.debug('initi called')
                 if (! isValidInitCall(params)) {
-                    console.debug('Invalid init call');
                     return;
                 }
 
@@ -410,18 +408,16 @@
                             base.initCompleted.disconnect(onInitCompleted);
                             if (success) {
                                 initialized = true;
-
-                                console.debug(JSON.stringify(params));
-
                                 callOnInitScriptFunc();
                             }
                         };
 
                         base.initCompleted.connect(onInitCompleted);
 
+                        var isLocal = params.__unity_webapps_hidden && params.__unity_webapps_hidden.local;
                         var url = params.__unity_webapps_hidden && params.__unity_webapps_hidden.url
                                 ? params.__unity_webapps_hidden.url : "";
-                        base.init(webappName, url, params);
+                        base.init(webappName, url, isLocal, params);
                     });
                 }
                 else {

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.cpp	2013-08-31 15:24:23 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.cpp	2013-09-06 12:56:00 +0000
@@ -63,6 +63,7 @@
 
 void UnityWebapps::init(const QString& name,
                         const QString& url,
+                        bool isLocal,
                         const QVariant& args)
 {
     Q_UNUSED(name);
@@ -70,53 +71,63 @@
     if (_appInfos != NULL)
         cleanup();
 
-    qDebug() << "init";
-
     if (QString(args.typeName()).compare("QVariantMap") != 0)
     {
         qDebug() << "Invalid init() parameter types: " << args.typeName();
-
         Q_EMIT initCompleted(false);
-
         return;
     }
 
+#define UNITY_WEBAPPS_IS_VALID(name,type) \
+    ( initArgs.contains(name) && initArgs.value(name).canConvert<type>() )
+
     QVariantMap initArgs =
         qvariant_cast<QVariantMap>(args);
-    if ( ! initArgs.contains("name") ||
-         ! initArgs.contains("domain") ||
-         ! initArgs.contains("iconUrl")
-         )
-    {
-        qDebug() << "Invalid init() parameter content (not found): name, domain and iconUrl are mandatory";
-
-        Q_EMIT initCompleted(false);
-
-        return;
-    }
-    if ( ! initArgs.value("name").canConvert<QString>() ||
-         ! initArgs.value("domain").canConvert<QString>() ||
-         ! initArgs.value("iconUrl").canConvert<QString>()
-         )
-    {
-        qDebug() << "Invalid init() parameter value types.";
-
-        Q_EMIT initCompleted(false);
-
-        return;
-    }
-
+    if ( ! UNITY_WEBAPPS_IS_VALID("name", QString))
+    {
+        qDebug() << "Invalid init() parameter content (not found or invalid): name is mandatory";
+        Q_EMIT initCompleted(false);
+        return;
+    }
     QString displayName = initArgs.value("name").toString();
-    QString iconUrl = initArgs.value("iconUrl").toString();
-    QString domain = initArgs.value("domain").toString();
-
-    bool success = initInternal(name, displayName, domain, iconUrl, url);
-
+
+    QString iconUrl =
+            initArgs.contains("iconUrl")
+                && UNITY_WEBAPPS_IS_VALID("iconUrl",QString)
+            ? initArgs.value("iconUrl").toString() : "";
+    QString domain =
+            initArgs.contains("domain")
+                && UNITY_WEBAPPS_IS_VALID("domain",QString)
+            ? initArgs.value("domain").toString() : "";
+
+    if ( ! isLocal && (iconUrl.isEmpty() || domain.isEmpty()))
+    {
+        qDebug() << "Invalid init() parameter content "
+                    "(not found or invalid): domain and iconUrl are mandatory for nonlocal apps";
+        Q_EMIT initCompleted(false);
+        return;
+    }
+
+    QString desktopId;
+    if (qgetenv("APP_ID").isEmpty()) {
+        desktopId = getDesktopFilenameFor(displayName, domain);
+    }
+    else {
+        desktopId = qgetenv("APP_ID");
+    }
+
+    qDebug() << "UnityWebapps initialized with desktop id: " << desktopId;
+
+    bool success = initInternal(name,
+                                displayName,
+                                domain,
+                                iconUrl,
+                                url);
     if (success)
         buildAppInfos(name,
                       displayName,
                       domain,
-                      getDesktopFilenameFor(displayName, domain),
+                      desktopId,
                       iconUrl);
 
     Q_EMIT initCompleted(success);
@@ -139,6 +150,17 @@
     _model = model;
 }
 
+bool UnityWebapps::isConfined() const
+{
+    //Cheap way to know if we work in a confined environment
+    //FIXME: think of a better way to handle desktop/phone specifics
+#if defined(Q_OS_LINUX) && ! defined(Q_PROCESSOR_X86)
+    return true;
+#else
+    return false;
+#endif
+}
+
 void UnityWebapps::buildAppInfos(const QString & name,
                                  const QString & displayName,
                                  const QString & domain,
@@ -244,6 +266,11 @@
                                        const QString& domain,
                                        const QString& iconName)
 {
+    // we bail out earlier (until we can do it w/ a builtin func) when
+    // in a confined environment.
+    if (isConfined ())
+        return true;
+
     if ( ! handleDesktopFileUpdates())
         return true;
 
@@ -375,21 +402,38 @@
 
 QString UnityWebapps::addLauncherAction(const QString& name)
 {
+    // we bail out earlier (until we can do it w/ a builtin func) when
+    // in a confined environment.
+    if (isConfined ())
+        return QString();
+
     return addAction(name, LAUNCHER_ACTION);
 }
 
 QString UnityWebapps::addIndicatorAction (const QString& name)
 {
+    // we bail out earlier (until we can do it w/ a builtin func) when
+    // in a confined environment.
+    if (isConfined ())
+        return QString();
     return addAction(name, INDICATOR_ACTION);
 }
 
 QString UnityWebapps::addStaticAction (const QString& name, const QString& url)
 {
+    // we bail out earlier (until we can do it w/ a builtin func) when
+    // in a confined environment.
+    if (isConfined ())
+        return QString();
     return addAction(name, STATIC_ACTION, url);
 }
 
 void UnityWebapps::removeLauncherAction(const QString& name)
 {
+    // we bail out earlier (until we can do it w/ a builtin func) when
+    // in a confined environment.
+    if (isConfined ())
+        return;
     if (_actions.contains(name) && (_actions[name].type & LAUNCHER_ACTION))
     {
         _actions[name].type &= ~LAUNCHER_ACTION;
@@ -400,6 +444,11 @@
 
 void UnityWebapps::removeLauncherActions()
 {
+    // we bail out earlier (until we can do it w/ a builtin func) when
+    // in a confined environment.
+    if (isConfined ())
+        return;
+
     bool found = false;
     Q_FOREACH(const QString & actionName, _actions.keys())
     {
@@ -442,6 +491,11 @@
 
 void UnityWebapps::updateDesktopFileContent ()
 {
+    // we bail out earlier (until we can do it w/ a builtin func) when
+    // in a confined environment.
+    if (isConfined ())
+        return;
+
     if ( ! handleDesktopFileUpdates())
         return;
 
@@ -466,6 +520,11 @@
 
 void UnityWebapps::ensureLocalApplicationsPathExists()
 {
+    // we bail out earlier (until we can do it w/ a builtin func) when
+    // in a confined environment.
+    if (isConfined ())
+        return;
+
     QString shareDirPath (getUserSharePath());
     if (shareDirPath.isEmpty())
     {

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.h'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.h	2013-08-31 14:20:57 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.h	2013-09-06 12:56:00 +0000
@@ -63,7 +63,7 @@
 public Q_SLOTS:
 
     // API functions
-    void init(const QString& name, const QString& url, const QVariant& args);
+    void init(const QString& name, const QString& url, bool isLocal, const QVariant& args);
 
     // class functions
     UnityWebappsAppInfos *appInfos();
@@ -122,6 +122,8 @@
               const QString& url);
     void cleanup();
 
+    bool isConfined() const;
+
     void buildAppInfos(const QString & name,
                        const QString & displayName,
                        const QString & domain,

=== modified file 'tests/integration/autopilot/html/test_webapps_hud.html'
--- tests/integration/autopilot/html/test_webapps_hud.html	2013-08-27 17:03:21 +0000
+++ tests/integration/autopilot/html/test_webapps_hud.html	2013-09-06 12:56:00 +0000
@@ -20,7 +20,7 @@
   console.log('ubuntu-webapps-api-ready received');
 
   unity = window.external.getUnityObject('1.0');
-  unity.init({name: 'unity-webapps-qml-', domain: 'launcher', onInit: onInit, iconUrl: 'icon://myicon'});
+  unity.init({name: 'unity-webapps-qml-launcher', onInit: onInit});
 }, false);
 
 

=== modified file 'tests/integration/autopilot/html/test_webapps_launcher.html'
--- tests/integration/autopilot/html/test_webapps_launcher.html	2013-08-26 20:16:16 +0000
+++ tests/integration/autopilot/html/test_webapps_launcher.html	2013-09-06 12:56:00 +0000
@@ -17,8 +17,7 @@
   console.log('ubuntu-webapps-api-ready received');
 
   unity = window.external.getUnityObject('1.0');
-
-  unity.init({name: 'unity-webapps-qml-', domain: 'launcher', onInit: onInit, iconUrl: 'icon://myicon'});
+  unity.init({name: 'unity-webapps-qml-launcher', onInit: onInit});
 }, false);
 
 function dispatchApiCall (target, name, args) {

=== modified file 'tests/integration/autopilot/html/test_webapps_messagingmenu.html'
--- tests/integration/autopilot/html/test_webapps_messagingmenu.html	2013-07-31 18:33:44 +0000
+++ tests/integration/autopilot/html/test_webapps_messagingmenu.html	2013-09-06 12:56:00 +0000
@@ -23,7 +23,7 @@
   console.log('ubuntu-webapps-api-ready received');
 
   unity = window.external.getUnityObject('1.0');
-  unity.init({name: 'MessagingIndicator TEST', domain: 'localhost', onInit: onInit, iconUrl: 'icon://myicon'});
+  unity.init({name: 'unity-webapps-qml-launcher', onInit: onInit});
 }, false);
 
 

=== modified file 'tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2013-07-31 18:33:44 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2013-09-06 12:56:00 +0000
@@ -33,6 +33,8 @@
         self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject(1.0) != null;'), Eventually(NotEquals(None)))
 
     def test_actionsApiFound(self):
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject(1.0) != null;'), Eventually(NotEquals(None)))
+
         expression = """
             var unity = window.external.getUnityObject(1.0);
             return unity.addAction != null && unity.clearAction && unity.clearActions != null;
@@ -40,6 +42,8 @@
         self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(NotEquals(None)))
 
     def test_notificationApiFound(self):
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject(1.0) != null;'), Eventually(NotEquals(None)))
+
         expression = """
             var unity = window.external.getUnityObject(1.0);
             return unity.Notification != null && unity.Notification.showNotification != null;
@@ -47,6 +51,8 @@
         self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(NotEquals(None)))
 
     def test_messagingIndicatorApiFound(self):
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject(1.0) != null;'), Eventually(NotEquals(None)))
+
         expression = """
             var unity = window.external.getUnityObject(1.0);
             return unity.MessagingIndicator != null &&
@@ -58,6 +64,8 @@
         self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(NotEquals(None)))
 
     def test_ubuntuReadyEventSent(self):
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject(1.0) != null;'), Eventually(NotEquals(None)))
+
         expression = """
             var api_ready_count = window.localStorage['ubuntu-webapps-api-ready-key'];
             return api_ready_count != null && api_ready_count > 0;