Merge lp:~abreu-alexandre/ubuntu-html5-theme/fix-oxide-support-rtm-14.09 into lp:ubuntu-html5-theme/rtm-14.09

[Alexandre Abreu]

Fix oxide support

Fix oxide support

[lp:~abreu-alexandre/ubuntu-html5-theme/fix-oxide-support-rtm-14.09]

178. By Alexandre Abreu on 2014-12-05

Fix oxide support

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-06 22:51:33 +0000
+++ CMakeLists.txt	2014-12-05 21:46:03 +0000
@@ -26,5 +26,9 @@
 add_custom_target(uninstall
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 
+# make non compiled files (QML, JS, images, etc.) visible in QtCreator
+file(GLOB_RECURSE NON_COMPILED_FILES *.qml *.js *.png *.py *.pot *.po *.qdoc *.qdocconf *.css *.html)
+add_custom_target(NON_COMPILED_TARGET ALL SOURCES ${NON_COMPILED_FILES})
+
 add_subdirectory(src)
 add_subdirectory(tests)
 
=== modified file 'debian/control'
--- debian/control	2014-09-22 21:12:32 +0000
+++ debian/control	2014-12-05 21:46:03 +0000
@@ -4,8 +4,7 @@
 Maintainer: Michael Hall <[e-mail]>
 Build-Depends: cmake (>= 2.8.9),
                debhelper (>= 9),
-               libqt5webkit5-dev,
-               qml-module-qtwebkit,
+               liboxideqt-qmlplugin (>= 1.2.0),
                python (>= 2.7),
                python-setuptools,
                qt5-default,
@@ -48,7 +47,7 @@
 Package: ubuntu-html5-ui-toolkit-examples
 Architecture: all
 Depends: libjs-jquery,
-         qml-module-qtwebkit,
+         liboxideqt-qmlplugin (>= 1.2.0),
          qmlscene,
          qtdeclarative5-qtquick2-plugin,
          ubuntu-html5-ui-toolkit (= ${binary:Version}),
@@ -66,7 +65,7 @@
          libautopilot-qt (>= 1.4),
          libjs-jquery,
          libqt5test5,
-         qml-module-qtwebkit,
+         liboxideqt-qmlplugin (>= 1.2.0),
          python-xlib,
          qmlscene,
          qtdeclarative5-qtquick2-plugin,
@@ -84,7 +83,7 @@
 Package: ubuntu-html5-container
 Architecture: any
 Multi-Arch: foreign
-Depends: qml-module-qtwebkit,
+Depends: liboxideqt-qmlplugin (>= 1.3.5),
          qmlscene,
          qtdeclarative5-cordova-2.8-plugin,
          qtdeclarative5-qtquick2-plugin,
@@ -102,7 +101,7 @@
 Architecture: all
 Depends: libautopilot-qt (>= 1.4),
          libqt5test5,
-         qml-module-qtwebkit,
+         liboxideqt-qmlplugin (>= 1.2.0),
          qtdeclarative5-qtquick2-plugin,
          ubuntu-html5-container (>= ${binary:Version}),
          ${misc:Depends},
 
=== modified file 'src/plugin/Ubuntu/WebApps/CordovaLoader.qml'
--- src/plugin/Ubuntu/WebApps/CordovaLoader.qml	2014-02-10 16:15:29 +0000
+++ src/plugin/Ubuntu/WebApps/CordovaLoader.qml	2014-12-05 21:46:03 +0000
@@ -23,6 +23,11 @@
 
     property string htmlIndexDirectory
 
+    // Remote Inspector Properties
+    property string remoteInspectorEnabled
+    property string remoteInspectorPort
+    property string remoteInspectorHost
+
     // Cordova plugin instance
     property var cordovaInstance: null
 
 
=== modified file 'src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml'
--- src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml	2014-02-10 17:58:49 +0000
+++ src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml	2014-12-05 21:46:03 +0000
@@ -25,11 +25,13 @@
 
     property var bindingMainWebview: null
 
+    signal ready()
+
     /*!
       \internal
      */
     function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(bindingMainWebview);
+        return UnityWebAppsUtils.makeProxiesForWebViewBindee(bindingMainWebview);
     }
 
     /*!
@@ -53,6 +55,8 @@
             bindee: root
             injectExtraUbuntuApis: true
             requiresInit: false
+
+            onUserScriptsInjected: root.ready()
         }
     }
 }
 
=== modified file 'src/plugin/Ubuntu/WebApps/WebAppContainer.qml'
--- src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2014-03-29 15:04:02 +0000
+++ src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2014-12-05 21:46:03 +0000
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.Extras.Browser 0.1
 
 
 /*!
@@ -30,17 +29,31 @@
 MainView {
     id: root
     objectName: "root"
+
     anchorToKeyboard: true
     automaticOrientation: true
 
     /*!
       \preliminary
+      The property defines if oxide is to be used as the webengine backend.
+      */
+    property bool oxide: true
+
+    /*!
+      \preliminary
       The property holds the path to the filesystem location where the 'index.html'
       file can be found (root of the HTML5 application).
 
       The path is absolute or relative to the current dir.
       */
-    property alias htmlIndexDirectory: cordovaWebviewProvider.htmlIndexDirectory
+    property string htmlIndexDirectory: ""
+
+    /*!
+      \preliminary
+      The properties hold whether the remote debugging interface should be enabled for the
+      Web View. The host ip and port for accessing the remote interface should be provided.
+      */
+    property bool remoteInspectorEnabled: false
 
     Page {
         id: mainPage
@@ -49,41 +62,6 @@
         /*!
           \internal
          */
-        CordovaLoader {
-            id: cordovaWebviewProvider
-            anchors.fill: parent
-            onCreationError: {
-                mainPage._onCordovaCreationError();
-            }
-            onCreated: {
-                bindings.bindingMainWebview = Qt.binding(function() {
-                    return cordovaInstance.mainWebview;
-                });
-            }
-        }
-
-        /*!
-          \internal
-         */
-        function _onCordovaCreationError() {
-            mainPage._fallbackToWebview();
-        }
-
-        /*!
-          \internal
-         */
-        function _fallbackToWebview() {
-            console.debug('Falling back on the plain Webview backend.')
-
-            webviewFallbackComponentLoader.sourceComponent = Qt.binding(function() {
-                return root.htmlIndexDirectory.length !== 0
-                        ? webviewFallbackComponent : null;
-            });
-        }
-
-        /*!
-          \internal
-         */
         function _getAppStartupIndexFileUri() {
             return 'file://' + root.htmlIndexDirectory + '/index.html';
         }
@@ -92,38 +70,19 @@
           \internal
          */
         Loader {
-            id: webviewFallbackComponentLoader
+            id: webviewComponentLoader
             anchors.fill: parent
             onLoaded: {
                 bindings.bindingMainWebview = item;
             }
         }
 
-        /*!
-          \internal
-         */
-        Component {
-            id: webviewFallbackComponent
-            UbuntuWebView {
-                url: mainPage._getAppStartupIndexFileUri()
-
-                experimental.preferences.localStorageEnabled: true
-                experimental.preferences.offlineWebApplicationCacheEnabled: true
-                experimental.preferences.universalAccessFromFileURLsAllowed: true
-                experimental.preferences.webGLEnabled: true
-
-                experimental.databaseQuotaDialog: Item {
-                    Timer {
-                        interval: 1
-                        running: true
-                        onTriggered: {
-                            model.accept(model.expectedUsage)
-                        }
-                    }
-                }
-                // port in QTWEBKIT_INSPECTOR_SERVER enviroment variable
-                experimental.preferences.developerExtrasEnabled: true
-            }
+        Component.onCompleted: {
+            var webview = oxide ?
+                Qt.resolvedUrl("WebViewOxide.qml")
+                : Qt.resolvedUrl("WebViewWebkit.qml");
+            webviewComponentLoader.setSource(webview, {
+                remoteInspectorEnabled: root.remoteInspectorEnabled});
         }
 
         /*!
@@ -131,6 +90,10 @@
          */
         UbuntuJavascriptBindings {
             id: bindings
+            onReady: {
+                webviewComponentLoader.item.url =
+                    mainPage._getAppStartupIndexFileUri();
+            }
         }
     }
 }
 
=== modified file 'src/ubuntu-html5-app-launcher/main.cpp'
--- src/ubuntu-html5-app-launcher/main.cpp	2014-04-03 13:57:30 +0000
+++ src/ubuntu-html5-app-launcher/main.cpp	2014-12-05 21:46:03 +0000
@@ -56,6 +56,33 @@
     }
 }
 
+static QString currentArchitecturePathName()
+{
+#if defined(Q_PROCESSOR_X86_32)
+    return QLatin1String("i386-linux-gnu");
+#elif defined(Q_PROCESSOR_X86_64)
+    return QLatin1String("x86_64-linux-gnu");
+#elif defined(Q_PROCESSOR_ARM)
+    return QLatin1String("arm-linux-gnueabihf");
+#else
+#error Unable to determine target architecture
+#endif
+}
+
+static bool canUseOxide()
+{
+    // Use a runtime hint to transparently know if oxide
+    // can be used as a backend without the user/dev having
+    // to update its app or change something in the Exec args.
+    // Version 1.1 of ubuntu apparmor policy allows this file to
+    // be accessed whereas v1.0 only knows about qtwebkit.
+    QString oxideHintLocation =
+        QString("/usr/lib/%1/oxide-qt/oxide-renderer")
+            .arg(currentArchitecturePathName());
+
+    return QFile(oxideHintLocation).open(QIODevice::ReadOnly);
+}
+
 } // namespace
 
 
@@ -142,6 +169,10 @@
     QString wwwfolderArg;
     bool maximized = false;
 
+    QString remoteInspectorHost = "";
+    QString remoteInspectorPort = QString::number(REMOTE_INSPECTOR_PORT);
+    bool remoteInspectorEnabled = false;
+
     QStringList arguments = app.arguments();
     arguments.pop_front();
 
@@ -149,7 +180,7 @@
     {
         if (argument.contains(WWW_LOCATION_ARG_HEADER))
         {
-            wwwfolderArg = argument.right(argument.count() - WWW_LOCATION_ARG_HEADER.count());
+            wwwfolderArg = argument.split(WWW_LOCATION_ARG_HEADER)[1];
         }
         else
         if (argument.contains(MAXIMIZED_ARG_HEADER))
@@ -159,20 +190,16 @@
         else
         if (argument.contains(INSPECTOR))
         {
-            QString host;
+            remoteInspectorEnabled = true;
             Q_FOREACH(QHostAddress address, QNetworkInterface::allAddresses()) {
                 if (!address.isLoopback() && (address.protocol() == QAbstractSocket::IPv4Protocol)) {
-                    host = address.toString();
+                    remoteInspectorHost = address.toString();
                     break;
                 }
             }
-            QString server;
-            if (host.isEmpty()) {
-                server = QString::number(REMOTE_INSPECTOR_PORT);
-            } else {
-                server = QString("%1:%2").arg(host, QString::number(REMOTE_INSPECTOR_PORT));
+            if (argument.startsWith(INSPECTOR + "=")) {
+                remoteInspectorPort = argument.split(INSPECTOR + "=")[1];
             }
-            qputenv("QTWEBKIT_INSPECTOR_SERVER", server.toUtf8());
         }
         else
         {
@@ -188,7 +215,6 @@
     }
 
     QFileInfo wwwFolder(wwwfolderArg);
-
     if (wwwFolder.isRelative())
     {
         wwwFolder.makeAbsolute();
@@ -218,6 +244,17 @@
     setUpQmlImportPathIfNecessary(plugin_path);
 
     QQuickView view;
+    QQmlEngine* engine = view.engine();
+    engine->rootContext()->setContextProperty("withOxide", canUseOxide());
+
+    if (remoteInspectorEnabled) {
+        qputenv("UBUNTU_WEBVIEW_DEVTOOLS_HOST", remoteInspectorHost.toUtf8());
+        qputenv("UBUNTU_WEBVIEW_DEVTOOLS_PORT", remoteInspectorPort.toUtf8());
+    }
+
+    engine->rootContext()->setContextProperty("inspector", remoteInspectorEnabled);
+    engine->rootContext()->setContextProperty("wwwFolder", wwwFolder.absoluteFilePath());
+    
     view.setSource(QUrl::fromLocalFile(Webapp::Config::getContainerMainQmlPath()
                                           + "/main.qml"));
     if (view.status() != QQuickView::Ready)
@@ -225,7 +262,6 @@
         qCritical() << "Main application component cannot be loaded.";
         return EXIT_FAILURE;
     }
-    view.rootObject()->setProperty("htmlIndexDirectory", wwwFolder.canonicalFilePath());
 
     view.setTitle(QCoreApplication::applicationName());
     view.setResizeMode(QQuickView::SizeRootObjectToView);
 
=== modified file 'src/ubuntu-html5-app-launcher/main.qml'
--- src/ubuntu-html5-app-launcher/main.qml	2014-02-10 16:15:29 +0000
+++ src/ubuntu-html5-app-launcher/main.qml	2014-12-05 21:46:03 +0000
@@ -23,5 +23,8 @@
 WebAppContainer {
     width: units.gu(100)
     height: units.gu(75)
+
+    oxide: withOxide
+    remoteInspectorEnabled: inspector
+    htmlIndexDirectory: wwwFolder
 }
-
 
=== modified file 'tests/autopilot/tools/qml/webview.qml'
--- tests/autopilot/tools/qml/webview.qml	2014-04-03 17:15:24 +0000
+++ tests/autopilot/tools/qml/webview.qml	2014-12-05 21:46:03 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
+import QtTest 1.0
+import com.canonical.Oxide 1.0 as Oxide
 
 Item {
     id: root
@@ -31,6 +31,8 @@
 
     signal resultUpdated(string message)
 
+    TestResult { id: qtest_testResult }
+
     function __gentid() {
         return Math.random() + '';
     }
@@ -64,23 +66,21 @@
         var tid = __gentid();
         var statement = 'document.getElementById("' + id + '").click();';
 
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(statement),
-		function(result) { root.resultUpdated(root.__createResult(result)); });
+        var result = webview.evaluateCode(statement, true);
+        root.resultUpdated(root.__createResult(result, tid));
     }
 
     function evalInPageUnsafe(expr) {
-        var tid = __gentid();
-
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(expr),
-		function(result) { root.resultUpdated(root.__createResult(result)); });
+        var result = webview.evaluateCode(expr, true);
+        root.resultUpdated(result.toString())
     }
 
     function clickAnyElementBySelector(selector) {
         var tid = __gentid();
         var statement = 'document.querySelectorAll("' + selector + '")[0].click();';
 
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(statement),
-		function(result) { root.resultUpdated(root.__createResult(result)); });
+        var result = webview.evaluateCode(statement, true);
+        root.resultUpdated(root.__createResult(result, tid));
     }
 
     function elementWithIdHasAttribute(id,attribute,value) {
@@ -95,13 +95,13 @@
         statement += hasAttributeWithIdFunc;
         statement += "; return __hasAttributeWithId(id,attribute,value); "
 
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(statement),
-		function(result) { root.resultUpdated(root.__createResult(result, tid)); });
+        var result = webview.evaluateCode(statement, true);
+        root.resultUpdated(root.__createResult(result, tid));
     }
 
     function isNodeWithIdVisible(id) {
         var tid = __gentid();
-	var isNodeWithIdVisibleFunc = '
+        var isNodeWithIdVisibleFunc = '
         function __isNodeWithIdVisible() {
             try { return document.getElementById(id).style.display !== "none"; } catch (e) { return e.toString(); };
             return false;
@@ -110,14 +110,15 @@
         var statement = __setupClosedVariables({'id': id});
         statement += isNodeWithIdVisibleFunc;
         statement += "; return __isNodeWithIdVisible(id); "
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(statement),
-		function(result) { root.resultUpdated(root.__createResult(result, tid)); });
+
+        var result = webview.evaluateCode(statement, true);
+        root.resultUpdated(root.__createResult(result, tid));
     }
 
     function getAttributeForElementWithId(id,attribute) {
         var tid = __gentid();
         var getAttributeWithIdFunc = '
-	function __getAttributeWithId() {
+        function __getAttributeWithId() {
             try { var value = document.querySelector("#" + id).getAttribute(attribute); return value || ""; } catch (e) { return e.toString(); };
             return "";
         };';
@@ -126,11 +127,11 @@
         statement += getAttributeWithIdFunc;
         statement += "; return __getAttributeWithId(); "
 
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(statement),
-		function(result) { root.resultUpdated(root.__createResult(result, tid)); });
+        var result = webview.evaluateCode(statement, true);
+        root.resultUpdated(root.__createResult(result, tid));
     }
 
-    WebView {
+    Oxide.WebView {
         objectName: "webview"
         id: webview
 
@@ -146,12 +147,77 @@
             left: parent.left
         }
 
-        experimental.userScripts: []
-        experimental.preferences.navigatorQtObjectEnabled: true
-        experimental.preferences.developerExtrasEnabled: true
-
-        experimental.userAgent: {
-            return "Mozilla/5.0 (iPad; CPU OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
+        preferences.localStorageEnabled: true
+        preferences.appCacheEnabled: true
+
+        function evaluateCode(code, wrap) {
+          var value = webview._waitForResult(
+              webview.rootFrame.sendMessage(
+                "oxide://main-world",
+                "EVALUATE-CODE",
+                { code: code,
+                  wrap: wrap === undefined ? false : wrap }));
+            return value ? value.result : undefined;
+        }
+
+        function _waitForResult(req, timeout) {
+          var result;
+          var error;
+          req.onreply = function(response) {
+              result = response;
+              error = 0;
+          };
+          req.onerror = function(error_code, msg) {
+              result = msg;
+              error = error_code;
+          };
+          webview._waitFor(function() { return error !== undefined; },
+                                timeout);
+
+          if (error > 0) {
+              console.error('Error:' + error + ', result:' + result)
+          } else if (error === 0) {
+              return result;
+          } else {
+              throw new Error("Message call timed out");
+          }
+        }
+
+        function _waitFor(predicate, timeout) {
+          timeout = timeout || 5000000;
+          var end = Date.now() + timeout;
+          var i = Date.now();
+          while (i < end && !predicate()) {
+              qtest_testResult.wait(50);
+              i = Date.now();
+          }
+          return predicate();
+        }
+
+        context: Oxide.WebContext {
+            userScripts: [
+                Oxide.UserScript {
+                    context: "oxide://main-world"
+                    emulateGreasemonkey: true
+                    url: Qt.resolvedUrl("message-server.js")
+                    matchAllFrames: true
+                }
+            ]
+        }
+
+        onJavaScriptConsoleMessage: {
+            var msg = "[JS] (%1:%2) %3".arg(sourceId).arg(lineNumber).arg(message)
+            if (level === Oxide.WebView.LogSeverityVerbose) {
+                console.log(msg)
+            } else if (level === Oxide.WebView.LogSeverityInfo) {
+                console.info(msg)
+            } else if (level === Oxide.WebView.LogSeverityWarning) {
+                console.warn(msg)
+            } else if ((level === Oxide.WebView.LogSeverityError) ||
+                       (level === Oxide.WebView.LogSeverityErrorReport) ||
+                       (level === Oxide.WebView.LogSeverityFatal)) {
+                console.error(msg)
+            }
         }
     }
 
 
=== modified file 'tests/autopilot/ubuntu_html5_container/__init__.py'
--- tests/autopilot/ubuntu_html5_container/__init__.py	2014-02-06 22:51:33 +0000
+++ tests/autopilot/ubuntu_html5_container/__init__.py	2014-12-05 21:46:03 +0000
@@ -2,9 +2,7 @@
 # Copyright 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 """Tests for the Ubuntu HTML5 Launcher package """
-
-
 
=== removed directory 'tests/autopilot/ubuntu_html5_container/emulators'
=== removed file 'tests/autopilot/ubuntu_html5_container/emulators/__init__.py'
--- tests/autopilot/ubuntu_html5_container/emulators/__init__.py	2014-02-06 22:51:33 +0000
+++ tests/autopilot/ubuntu_html5_container/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2014 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""Tests for the Ubuntu HTML5 Launcher package """
-
-
 
=== modified file 'tests/autopilot/ubuntu_html5_container/tests/__init__.py'
--- tests/autopilot/ubuntu_html5_container/tests/__init__.py	2014-02-06 22:51:33 +0000
+++ tests/autopilot/ubuntu_html5_container/tests/__init__.py	2014-12-05 21:46:03 +0000
@@ -2,18 +2,22 @@
 # Copyright 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 """Tests for the Ubuntu HTML5 Launcher package """
 
 import os
 from autopilot.testcase import AutopilotTestCase
 
+
 LAUNCHER_EXEC_NAME = 'ubuntu-html5-app-launcher'
 
-LOCAL_LAUNCHER_PATH = os.path.abspath("%s/%s" % (os.path.dirname(os.path.realpath(__file__))
-                                        , '../../../../src/ubuntu-html5-app-launcher/' + LAUNCHER_EXEC_NAME))
+LOCAL_LAUNCHER_PATH = os.path.abspath(
+    "{}/{}".format(
+        os.path.dirname(os.path.realpath(__file__)),
+        '../../../../src/ubuntu-html5-app-launcher/' + LAUNCHER_EXEC_NAME))
+
 INSTALLED_LAUNCHER_PATH = '/usr/bin/' + LAUNCHER_EXEC_NAME
 
 
@@ -35,7 +39,8 @@
 
     def launch_with_argument(self, args):
         try:
-            self.app = self.launch_test_application(self.get_launcher_path(), args)
-        except Exception, e:
+            self.app = self.launch_test_application(
+                self.get_launcher_path(),
+                args)
+        except Exception:
             pass
-
 
=== modified file 'tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py'
--- tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py	2014-02-06 22:51:33 +0000
+++ tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py	2014-12-05 21:46:03 +0000
@@ -2,12 +2,12 @@
 # Copyright 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 from __future__ import absolute_import
 
-from testtools.matchers import Equals
+from testtools.matchers import NotEquals
 
 from ubuntu_html5_container.tests import UbuntuHtml5LauncherTestCase
 
@@ -16,7 +16,6 @@
     def setUp(self):
         super(UbuntuHtml5LauncherAppLaunchTestCase, self).setUp()
 
-    def test_launcherFailsWithNoWWW(self):
+    def test_launcher_succeeds_with_no_www(self):
         self.launch_with_argument('')
-        self.assertThat(self.get_app(), Equals(None))
-
+        self.assertThat(self.get_app(), NotEquals(None))
 
=== modified file 'tests/autopilot/ubuntu_html5_ui_toolkit/__init__.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/__init__.py	2014-01-28 18:25:08 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/__init__.py	2014-12-05 21:46:03 +0000
@@ -2,8 +2,7 @@
 # Copyright 2013 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 """Tests for the Ubuntu HTML5 UI SDK package """
-
 
=== removed directory 'tests/autopilot/ubuntu_html5_ui_toolkit/emulators'
=== removed file 'tests/autopilot/ubuntu_html5_ui_toolkit/emulators/__init__.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/emulators/__init__.py	2014-01-28 18:25:08 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""Tests for the Ubuntu HTML5 UI SDK package """
-
-
 
=== modified file 'tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py	2014-02-11 12:11:48 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py	2014-12-05 21:46:03 +0000
@@ -2,20 +2,20 @@
 # Copyright 2013 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 """Tests for the Ubuntu HTML5 package """
 
 import os
 import json
-import BaseHTTPServer
+import http.server as http
 import threading
 import subprocess
 
 HTTP_SERVER_PORT = 8383
 
-from testtools.matchers import Contains, Equals, GreaterThan
+from testtools.matchers import Equals, GreaterThan
 from autopilot.matchers import Eventually
 from autopilot.testcase import AutopilotTestCase
 from autopilot.input import Mouse, Touch, Pointer
@@ -25,14 +25,17 @@
 # from autopilot.introspection.qt import QtIntrospectionTestMixin
 
 
-class RequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
-    BASE_PATH_FOR_SERVED_APPS = {'rss-reader': "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../../../0.1/examples/apps/rss-reader')}
+class RequestHandler(http.BaseHTTPRequestHandler):
+    BASE_PATH_FOR_SERVED_APPS = {'rss-reader': "{}/{}".format(
+        os.path.dirname(os.path.realpath(__file__)),
+        '../../../../0.1/examples/apps/rss-reader')}
 
     def get_served_filename(self, appname, filename):
         if len(filename) == 0 or filename == '/':
             filename = 'autopilot.html'
-        print os.path.join(self.BASE_PATH_FOR_SERVED_APPS[appname], filename)
-        return os.path.join(self.BASE_PATH_FOR_SERVED_APPS[appname], filename)
+        return os.path.join(
+            self.BASE_PATH_FOR_SERVED_APPS[appname],
+            filename)
 
     def serve_file(self, filename):
         import mimetypes
@@ -51,7 +54,10 @@
         if self.path.startswith('/rss-reader'):
             filename = self.path[len('/rss-reader'):]
             self.send_response(200)
-            self.serve_file(self.get_served_filename('rss-reader', filename))
+            self.serve_file(
+                self.get_served_filename(
+                    'rss-reader',
+                    filename))
         else:
             self.send_error(404)
 
@@ -59,7 +65,9 @@
 class UbuntuHTML5HTTPServer(threading.Thread):
     def __init__(self, port):
         super(UbuntuHTML5HTTPServer, self).__init__()
-        self.server = BaseHTTPServer.HTTPServer(("", port), RequestHandler)
+        self.server = http.BaseHTTPServer.HTTPServer(
+            ("", port),
+            RequestHandler)
         self.server.allow_reuse_address = True
 
     def run(self):
@@ -71,15 +79,22 @@
 
 
 class UbuntuHTML5TestCaseBase(AutopilotTestCase):
-    BROWSER_CONTAINER_PATH = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../tools/qml/webview.qml')
-    INSTALLED_BROWSER_CONTAINER_PATH = '/usr/share/ubuntu-html5-ui-toolkit/tests/tools/qml/webview.qml'
-    arch = subprocess.check_output(
-        ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
-    BROWSER_QML_APP_LAUNCHER = "/usr/lib/" + arch + "/qt5/bin/qmlscene"
+    BROWSER_CONTAINER_PATH = "{}/{}".format(
+        os.path.dirname(os.path.realpath(__file__)),
+        '../../tools/qml/webview.qml')
+    INSTALLED_BROWSER_CONTAINER_PATH = \
+        '/usr/share/ubuntu-html5-ui-toolkit/tests/tools/qml/webview.qml'
+    BROWSER_QML_APP_LAUNCHER = "/usr/lib/{}/qt5/bin/qmlscene".format(
+        subprocess.check_output(
+            ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip().decode('utf-8'))
 
     # TODO: fix version
-    LOCAL_HTML_EXAMPLES_PATH = os.path.abspath("%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../../../tests'))
-    INSTALLED_HTML_EXAMPLES_PATH = '/usr/share/ubuntu-html5-ui-toolkit/tests/'
+    LOCAL_HTML_EXAMPLES_PATH = os.path.abspath(
+        "{}/{}".format(
+            os.path.dirname(os.path.realpath(__file__)),
+            '../../../../tests'))
+    INSTALLED_HTML_EXAMPLES_PATH = \
+        '/usr/share/ubuntu-html5-ui-toolkit/tests/'
 
     APPS_SUBFOLDER_NAME = 'apps'
 
@@ -106,16 +121,20 @@
         else:
             self.pointer = Pointer(Touch.create())
 
-        params = [self.BROWSER_QML_APP_LAUNCHER, self.get_browser_container_path()]
-        if (platform.model() <> 'Desktop'):
-            params.append('--desktop_file_hint=/usr/share/applications/unitywebappsqmllauncher.desktop')
+        params = [self.BROWSER_QML_APP_LAUNCHER,
+                  self.get_browser_container_path()]
+        if (platform.model() != 'Desktop'):
+            params.append(
+                '--desktop_file_hint=/usr/share/" \
+                + "applications/unitywebappsqmllauncher.desktop')
 
         self.app = self.launch_test_application(
             *params,
             app_type='qt')
 
         self.webviewContainer = self.get_webviewContainer()
-        self.watcher = self.webviewContainer.watch_signal('resultUpdated(QString)')
+        self.watcher = self.webviewContainer.watch_signal(
+            'resultUpdated(QString)')
         super(UbuntuHTML5TestCaseBase, self).setUp()
 
     def tearDown(self):
@@ -143,40 +162,60 @@
 
     def assert_url_eventually_loaded(self, url):
         webview = self.get_webview()
-        self.assertThat(webview.loadProgress, Eventually(Equals(100)))
-        self.assertThat(webview.loading, Eventually(Equals(False)))
-        self.assertThat(webview.url, Eventually(Equals(url)))
+        self.assertThat(
+            webview.loadProgress,
+            Eventually(Equals(100)))
+        self.assertThat(
+            webview.loading,
+            Eventually(Equals(False)))
+        self.assertThat(
+            webview.url,
+            Eventually(Equals(url)))
 
     def click_dom_node_with_id(self, id):
         webview = self.get_webviewContainer()
         webview.slots.clickElementById(id)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(Equals(1)))
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(Equals(1)))
 
     def click_any_dom_node_by_selector(self, selector):
         webview = self.get_webviewContainer()
         webview.slots.clickAnyElementBySelector(selector)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(Equals(1)))
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(Equals(1)))
 
     def is_dom_node_visible(self, id):
         webview = self.get_webviewContainer()
         prev_emissions = self.watcher.num_emissions
         webview.slots.isNodeWithIdVisible(id)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(GreaterThan(prev_emissions)))
-        return json.loads(webview.get_signal_emissions('resultUpdated(QString)')[-1][0])['result']
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(GreaterThan(prev_emissions)))
+        return json.loads(
+            webview.get_signal_emissions(
+                'resultUpdated(QString)')[-1][0])['result']
 
     def eval_expression_in_page_unsafe(self, expr):
         webview = self.get_webviewContainer()
         prev_emissions = self.watcher.num_emissions
-        webview.slots.evalInPageUnsafe(expr)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(GreaterThan(prev_emissions)))
-        return json.loads(webview.get_signal_emissions('resultUpdated(QString)')[-1][0])['result']
+        result = webview.slots.evalInPageUnsafe(expr)
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(GreaterThan(prev_emissions)))
+        return webview.get_signal_emissions('resultUpdated(QString)')[-1][0]
 
     def get_dom_node_id_attribute(self, id, attribute):
         webview = self.get_webviewContainer()
         prev_emissions = self.watcher.num_emissions
         webview.slots.getAttributeForElementWithId(id, attribute)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(GreaterThan(prev_emissions)))
-        return json.loads(webview.get_signal_emissions('resultUpdated(QString)')[-1][0])['result']
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(GreaterThan(prev_emissions)))
+        return json.loads(
+            webview.get_signal_emissions(
+                'resultUpdated(QString)')[-1][0])['result']
 
     def get_address_bar_action_button(self):
         addressbar = self.get_addressbar()
@@ -185,23 +224,29 @@
     def browse_to_url(self, url):
         import time
         addressbar = self.get_addressbar()
-        self.assertThat(addressbar.activeFocus, Eventually(Equals(True)))
+        self.assertThat(
+            addressbar.activeFocus,
+            Eventually(Equals(True)))
 
         self.keyboard.type(url, 0.001)
 
         self.pointer.click_object(self.get_webview())
+
+        # XXX: very bad, but wont fix
         time.sleep(1)
 
-        button = self.get_address_bar_action_button();
+        button = self.get_address_bar_action_button()
         self.pointer.move_to_object(button)
         self.pointer.press()
+        # XXX: very bad, but wont fix
         time.sleep(1)
         self.pointer.release()
 
-        self.assert_url_eventually_loaded(url);
+        self.assert_url_eventually_loaded(url)
 
     def browse_to_app(self, appname):
-        appfilepath = os.path.abspath(self.BASE_PATH +
+        appfilepath = os.path.abspath(
+            self.BASE_PATH +
             '/data/html/' +
             self.APPS_SUBFOLDER_NAME +
             '/' +
@@ -213,7 +258,12 @@
         self.browse_to_url(APP_HTML_PATH)
 
     def browse_to_test_html(self, html_filename):
-        self.browse_to_url(self.create_file_url_from(os.path.abspath(self.BASE_PATH + '/data/html/' + html_filename)))
+        self.browse_to_url(
+            self.create_file_url_from(
+                os.path.abspath(
+                    '{}/data/html/{}'.format(
+                        self.BASE_PATH,
+                        html_filename))))
 
 
 class UbuntuThemeWithHttpServerTestCaseBase(UbuntuHTML5TestCaseBase):
 
=== modified file 'tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_pagestack.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_pagestack.py	2014-03-05 16:21:16 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_pagestack.py	2014-12-05 21:46:03 +0000
@@ -2,17 +2,16 @@
 # Copyright 2013 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 from __future__ import absolute_import
 
-import time
-
-from testtools.matchers import Contains, Equals
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
-from ubuntu_html5_ui_toolkit.tests import UbuntuHTML5TestCaseBase, UbuntuThemeRemotePageTestCaseBase
+from ubuntu_html5_ui_toolkit.tests import UbuntuHTML5TestCaseBase
+
 
 class UbuntuThemePageStackTestCase(UbuntuHTML5TestCaseBase):
 
@@ -21,25 +20,54 @@
 
     def test_pageLoadsWithNoPageStacks(self):
         self.browse_to_test_html('test-nopagestack-in-app.html')
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); return "ok";'), Equals('ok'));
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); UI.init(); return "ok";'),
+            Equals('ok'))
 
     def test_pageLoadsWithPageStacks(self):
         self.browse_to_test_html('test-pagestack-in-app.html')
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); return "ok";'), Equals('ok'));
-        self.assertThat(self.is_dom_node_visible('main'), Equals(True))
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); UI.init(); return "ok";'),
+            Equals('ok'))
+        self.assertThat(
+            self.is_dom_node_visible('main'),
+            Equals(True))
 
     def test_pageChangeWithPageStackPush(self):
         self.browse_to_test_html('test-pagestack-in-app.html')
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); UI.pagestack.push("results"); return "ok";'), Equals('ok'));
-        self.assertThat(self.is_dom_node_visible('main'), Equals(False))
-        self.assertThat(self.is_dom_node_visible('results'), Equals(True))
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); UI.init(); '
+                'UI.pagestack.push("results"); return "ok";'),
+            Equals('ok'))
+        self.assertThat(
+            self.is_dom_node_visible('main'),
+            Equals(False))
+        self.assertThat(
+            self.is_dom_node_visible('results'),
+            Equals(True))
 
     def test_pageChangeWithPageStackPopped(self):
         self.browse_to_test_html('test-pagestack-in-app.html')
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); UI.pagestack.push("main"); UI.pagestack.push("results"); UI.pagestack.push("article"); UI.pagestack.pop(); return "ok";'), Equals('ok'));
-        self.assertThat(self.is_dom_node_visible('main'), Equals(False))
-        self.assertThat(self.is_dom_node_visible('results'), Equals(True))
-        self.assertThat(self.is_dom_node_visible('article'), Equals(False))
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); UI.init(); '
+                'UI.pagestack.push("main"); '
+                'UI.pagestack.push("results"); '
+                'UI.pagestack.push("article"); '
+                'UI.pagestack.pop(); return "ok";'),
+            Equals('ok'))
+        self.assertThat(
+            self.is_dom_node_visible('main'),
+            Equals(False))
+        self.assertThat(
+            self.is_dom_node_visible('results'),
+            Equals(True))
+        self.assertThat(
+            self.is_dom_node_visible('article'),
+            Equals(False))
 
     def test_pagePushWithProperties(self):
         self.browse_to_test_html('test-pagestack-in-app.html')
@@ -50,14 +78,22 @@
 
         (new Page('results')).onactivated(
           function(properties) {
-            document.getElementById('results').innerHTML = JSON.stringify(properties);
+            document.getElementById('results').innerHTML =
+                JSON.stringify(properties);
           });
 
         ui.pagestack.push('results', 'WORKS');
         return 'ok';
         """
-        self.assertThat(self.eval_expression_in_page_unsafe(expression), Equals('ok'));
-        self.assertThat(lambda: self.is_dom_node_visible('results'), Eventually(Equals(True)))
-        results_html_content = "return document.getElementById('results').innerHTML;"
-        self.assertThat(self.eval_expression_in_page_unsafe(results_html_content), Equals('"WORKS"'));
-
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(expression),
+            Equals('ok'))
+        self.assertThat(
+            lambda: self.is_dom_node_visible('results'),
+            Eventually(Equals(True)))
+        results_html_content = \
+            "return document.getElementById('results').innerHTML;"
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                results_html_content),
+            Equals('"WORKS"'))
 
=== modified file 'tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_rss_reader.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_rss_reader.py	2014-01-27 21:34:44 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_rss_reader.py	2014-12-05 21:46:03 +0000
@@ -2,17 +2,16 @@
 # Copyright 2013 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 from __future__ import absolute_import
 
-import time
-
 from testtools.matchers import Contains, Equals
 from autopilot.matchers import Eventually
 
-from ubuntu_html5_ui_toolkit.tests import UbuntuHTML5TestCaseBase, UbuntuThemeRemotePageTestCaseBase
+from ubuntu_html5_ui_toolkit.tests import UbuntuHTML5TestCaseBase
+
 
 class UbuntuThemeRSSReaderTestCase(UbuntuHTML5TestCaseBase):
     def setUp(self):
@@ -29,6 +28,8 @@
 
     def test_switchToFeedView(self):
         self.click_any_dom_node_by_selector('#yourfeeds li a')
-        self.assertThat(lambda: self.is_dom_node_visible('main'), Eventually(Equals(False)))
+        self.assertThat(
+            lambda: self.is_dom_node_visible('main'),
+            Eventually(Equals(False)))
         self.assertThat(self.is_dom_node_visible('article'), Equals(False))
         self.assertThat(self.is_dom_node_visible('results'), Equals(True))
 
=== modified file 'tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_tabs.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_tabs.py	2014-03-05 20:06:49 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_tabs.py	2014-12-05 21:46:03 +0000
@@ -2,18 +2,17 @@
 # Copyright 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 from __future__ import absolute_import
 
-import time
-
-from testtools.matchers import Contains, Equals
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
 from ubuntu_html5_ui_toolkit.tests import UbuntuHTML5TestCaseBase
 
+
 class UbuntuUIToolkitTabsTestCase(UbuntuHTML5TestCaseBase):
 
     def setUp(self):
@@ -21,11 +20,27 @@
 
     def test_programaticTabSelectIndex(self):
         self.browse_to_test_html('test-tabs-in-app.html')
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); UI.tabs.selectedTabIndex = 1; return "ok";'), Equals('ok'));
-
-        self.assertThat(lambda: self.is_dom_node_visible('tab1'), Eventually(Equals(False)))
-        self.assertThat(lambda: self.is_dom_node_visible('tab2'), Eventually(Equals(True)))
-        self.assertThat(lambda: self.is_dom_node_visible('tab3'), Eventually(Equals(False)))
-
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); return UI.tabs.selectedTabIndex = 1;'), Equals(1));
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); '
+                'UI.init(); UI.tabs.selectedTabIndex = 1; '
+                'return "ok";'),
+            Equals('ok'))
+
+        self.assertThat(
+            lambda: self.is_dom_node_visible('tab1'),
+            Eventually(Equals(False)))
+        self.assertThat(
+            lambda: self.is_dom_node_visible('tab2'),
+            Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.is_dom_node_visible('tab3'),
+            Eventually(Equals(False)))
+
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); '
+                'UI.init(); '
+                'return UI.tabs.selectedTabIndex;'),
+            Equals('1'))