Merge lp:~aacid/unity-2d/unity-2d_remove_testability_loading into lp:unity-2d

[Albert Astals Cid]

Remove code to load testability since Qt does that for us

[Gerry Boland (gerboland)]

Thanks for cleaning up my mess :)

review: Approve

=== removed file 'libunity-2d-private/src/testabilityinterface.h'
--- libunity-2d-private/src/testabilityinterface.h	2011-12-09 15:16:58 +0000
+++ libunity-2d-private/src/testabilityinterface.h	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-/*************************************************************************** 
-** 
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
-** All rights reserved. 
-** Contact: Nokia Corporation ([e-mail]) 
-** 
-** This file is part of TDriver. 
-** 
-** If you have questions regarding the use of this file, please contact 
-** Nokia at [e-mail] . 
-** 
-** This library is free software; you can redistribute it and/or 
-** modify it under the terms of the GNU Lesser General Public 
-** License version 2.1 as published by the Free Software Foundation 
-** and appearing in the file LICENSE.LGPL included in the packaging 
-** of this file.
-**
-****************************************************************************/
-
-#include <QObject>
-#include <QString>
-
-class TestabilityInterface
-{
-public:
-     virtual ~TestabilityInterface() {}
-
-     /*!
-       Initializes the plugin once loaded.
-     */
-     virtual void Initialize() = 0;
-
-};
-
- Q_DECLARE_INTERFACE(TestabilityInterface,
-                     "com.nokia.testability.TestabilityInterface/1.0")
-

=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
--- libunity-2d-private/src/unity2dapplication.cpp	2011-12-09 15:16:58 +0000
+++ libunity-2d-private/src/unity2dapplication.cpp	2012-01-23 10:36:19 +0000
@@ -45,7 +45,6 @@
 #include <QtPlugin>
 #include <QPluginLoader>
 #include <QLibraryInfo>
-#include "testabilityinterface.h"
 
 // libc
 #include <stdlib.h>
@@ -163,11 +162,6 @@
 : QApplication(argc, argv)
 , m_platformFontTracker(new PlatformFontTracker)
 {
-    /* Load Testability Plugin on startup if requested */
-    if (arrayContains(argv, argv + argc, "-testability")) {
-        loadTestabilityPlugin();
-    }
-
     /* Configure translations */
     Unity2dTr::init("unity-2d", INSTALL_PREFIX "/share/locale");
 
@@ -219,35 +213,4 @@
     return QApplication::x11EventFilter(event);
 }
 
-/*
- * Load the Testability Plugin if available
- *
- * Testability is a tool required for UI testing. See tests/ directory.
- */
-void Unity2dApplication::loadTestabilityPlugin()
-{
-     QString testabilityPlugin = "testability/libtestability";
-     QString testabilityPluginPostfix = ".so";
-
-     testabilityPlugin = QLibraryInfo::location(QLibraryInfo::PluginsPath)
-                         + QObject::tr("/") + testabilityPlugin + testabilityPluginPostfix;
-     QPluginLoader loader(testabilityPlugin.toLatin1().data());
-
-     QObject *plugin = loader.instance();
-     if (plugin) {
-         qDebug("Testability plugin loaded successfully!");
-         testabilityInterface = qobject_cast<TestabilityInterface *>(plugin);
-
-         if (testabilityInterface) {
-             qDebug("Testability interface obtained!");
-             testabilityInterface->Initialize();
-         } else {
-             qDebug("Failed to get testability interface!");
-         }
-     } else {
-         qDebug("Testability plugin %s load failed with error:%s",
-                testabilityPlugin.toLatin1().data(), loader.errorString().toLatin1().data());
-     }
-}
-
 #include <unity2dapplication.moc>

=== modified file 'libunity-2d-private/src/unity2dapplication.h'
--- libunity-2d-private/src/unity2dapplication.h	2011-12-09 15:16:58 +0000
+++ libunity-2d-private/src/unity2dapplication.h	2012-01-23 10:36:19 +0000
@@ -29,8 +29,6 @@
 
 class PlatformFontTracker;
 
-class TestabilityInterface;
-
 class AbstractX11EventFilter
 {
 public:
@@ -71,7 +69,6 @@
     void loadTestabilityPlugin();
     QList<AbstractX11EventFilter*> m_x11EventFilters;
     PlatformFontTracker* m_platformFontTracker;
-    TestabilityInterface* testabilityInterface;
 };
 
 #endif // UNITY2DAPPLICATION_H