Merge lp:~thomas-voss/trust-store/fix-1420790 into lp:trust-store

[Thomas Voß]

Add support for enabling the testability driver for the trust prompt.

Add support for enabling the testability driver for the trust prompt.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/trust-store-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/84/rebuild

review: Approve (continuous-integration)

[I Ahmad (iahmad)]

Looks good to me

review: Approve

[lp:~thomas-voss/trust-store/fix-1420790]

92. By Thomas Voß on 2015-02-13

Introduce namespace aliases.

=== modified file 'src/core/trust/mir/prompt_main.cpp'
--- src/core/trust/mir/prompt_main.cpp	2014-11-06 10:38:33 +0000
+++ src/core/trust/mir/prompt_main.cpp	2015-02-13 12:08:21 +0000
@@ -22,6 +22,7 @@
 // Qt
 #include <QCommandLineParser>
 #include <QGuiApplication>
+#include <QLibrary>
 
 #include <QQuickView>
 #include <QQuickItem>
@@ -38,6 +39,11 @@
 #include "prompt_config.h"
 #include "prompt_main.h"
 
+namespace cli = core::trust::mir::cli;
+namespace env = core::trust::mir::env;
+
+namespace this_env = core::posix::this_process::env;
+
 namespace core
 {
 namespace trust
@@ -66,22 +72,22 @@
 {
     // We are throwing exceptions here, which immediately calls abort and still gives a
     // helpful error message on the terminal.
-    if (vm.count(core::trust::mir::cli::option_title) == 0) throw std::logic_error
+    if (vm.count(cli::option_title) == 0) throw std::logic_error
     {
         "Missing option title."
     };
 
-    if (vm.count(core::trust::mir::cli::option_description) == 0) throw std::logic_error
+    if (vm.count(cli::option_description) == 0) throw std::logic_error
     {
         "Missing option description"
     };
 
-    if (vm.count(core::trust::mir::cli::option_server_socket) == 0) throw std::logic_error
+    if (vm.count(cli::option_server_socket) == 0) throw std::logic_error
     {
         "Missing option mir_server_socket"
     };
 
-    std::string mir_server_socket = vm[core::trust::mir::cli::option_server_socket].as<std::string>();
+    std::string mir_server_socket = vm[cli::option_server_socket].as<std::string>();
 
     if (mir_server_socket.find("fd://") != 0) throw std::logic_error
     {
@@ -91,15 +97,15 @@
 }
 }
 
-
 int main(int argc, char** argv)
 {
     boost::program_options::options_description options;
     options.add_options()
-            (core::trust::mir::cli::option_server_socket, boost::program_options::value<std::string>(), "Mir server socket to connect to.")
-            (core::trust::mir::cli::option_description, boost::program_options::value<std::string>(), "Extended description of the prompt.")
-            (core::trust::mir::cli::option_title, boost::program_options::value<std::string>(), "Title of the prompt.")
-            (core::trust::mir::cli::option_testing, "Only checks command-line parameters and does not execute any actions.");
+            (cli::option_server_socket, boost::program_options::value<std::string>(), "Mir server socket to connect to.")
+            (cli::option_description, boost::program_options::value<std::string>(), "Extended description of the prompt.")
+            (cli::option_title, boost::program_options::value<std::string>(), "Title of the prompt.")
+            (cli::option_testing, "Only checks command-line parameters and does not execute any actions.")
+            (cli::option_testability, "Loads the Qt Testability plugin if provided.");
 
     auto parsed_options = boost::program_options::command_line_parser{argc, argv}
             .options(options)
@@ -117,29 +123,29 @@
     boost::program_options::notify(vm);
 
     // We just verify command line arguments in testing and immediately return.
-    if (vm.count(core::trust::mir::cli::option_testing) > 0)
+    if (vm.count(cli::option_testing) > 0)
     {
         testing::validate_command_line_arguments(vm); return 0;
     }
 
     // Let's validate the arguments.
-    if (vm.count(core::trust::mir::cli::option_title) == 0)
+    if (vm.count(cli::option_title) == 0)
         abort(); // We have to call abort here to make sure that we get signalled.
 
-    std::string title = vm[core::trust::mir::cli::option_title].as<std::string>();
+    std::string title = vm[cli::option_title].as<std::string>();
 
     std::string description;
-    if (vm.count(core::trust::mir::cli::option_description) > 0)
-        description = vm[core::trust::mir::cli::option_description].as<std::string>();
+    if (vm.count(cli::option_description) > 0)
+        description = vm[cli::option_description].as<std::string>();
 
-    if (vm.count(core::trust::mir::cli::option_server_socket) > 0)
+    if (vm.count(cli::option_server_socket) > 0)
     {
         // We make sure that the env variable is not set prior to adusting it.
-        core::posix::this_process::env::unset_or_throw(core::trust::mir::env::option_mir_socket);
+        this_env::unset_or_throw(env::option_mir_socket);
 
-        core::posix::this_process::env::set_or_throw(
-                    core::trust::mir::env::option_mir_socket,
-                    vm[core::trust::mir::cli::option_server_socket].as<std::string>());
+        this_env::set_or_throw(
+                    env::option_mir_socket,
+                    vm[cli::option_server_socket].as<std::string>());
     }
 
     // We install our default gettext domain prior to anything qt.
@@ -165,6 +171,28 @@
     // to the application.
     QGuiApplication app{argc, argv};
 
+    if (vm.count(cli::option_testability) > 0 ||
+        this_env::get(env::option_testability, "0") == "1")
+    {
+        // This initialization code is copy'n'pasted across multiple projects. We really should _not_
+        // do something like that and bundle initialization routines in autopilot-qt.
+        // The testability driver is only loaded by QApplication but not by QGuiApplication.
+        // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
+        QLibrary testLib(QLatin1String("qttestability"));
+        if (testLib.load())
+        {
+            typedef void (*TasInitialize)(void);
+            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
+            if (initFunction)
+                initFunction();
+            else
+                qCritical("Library qttestability resolve failed!");
+        } else
+        {
+            qCritical("Library qttestability load failed!");
+        }
+    }
+
     core::trust::mir::SignalTrap signal_trap;
 
     QQuickView* view = new QQuickView();
@@ -174,11 +202,11 @@
     // Make some properties known to the root context.
     // The title of the dialog.
     view->rootContext()->setContextProperty(
-                core::trust::mir::cli::option_title,
+                cli::option_title,
                 title.c_str());
     // The description of the dialog.
     view->rootContext()->setContextProperty(
-                    core::trust::mir::cli::option_description,
+                    cli::option_description,
                     description.c_str());
 
     // Point the engine to the right directory. Please note that

=== modified file 'src/core/trust/mir/prompt_main.h'
--- src/core/trust/mir/prompt_main.h	2014-07-24 11:30:09 +0000
+++ src/core/trust/mir/prompt_main.h	2015-02-13 12:08:21 +0000
@@ -32,6 +32,11 @@
 {
     "MIR_SOCKET"
 };
+/** @brief Name of the environment variable that triggers loading of the testability plugin. */
+static constexpr const char* option_testability
+{
+    "QT_LOAD_TESTABILITY"
+};
 }
 namespace cli
 {
@@ -58,6 +63,12 @@
 {
     "testing"
 };
+
+/** @brief Loads the Qt Testability plugin if provided. */
+static constexpr const char* option_testability
+{
+    "testability"
+};
 }
 }
 }