From 5962f2b5b1b17e7a091ed4641a21119d85bb388d Mon Sep 17 00:00:00 2001
From: El Mehdi Fekari <mfekari@blackberry.com>
Date: Mon, 19 May 2014 11:47:36 +0200
Subject: [PATCH] Qnx: Fix broken configuration manager test

The change 0e67b293b7eaf0bff055d1587577c453397ba153
broke the configuration manager test since
the manager gets now instantiated when loading the plugin
whereas the test assumes that it would be instantiated
when ::instance() is called the first time.

Change-Id: I8f873fa56305da37590e401e8cfb98b8c92fe89d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
---
 src/plugins/qnx/blackberryconfigurationmanager.cpp | 13 +++++++++++++
 src/plugins/qnx/blackberryconfigurationmanager.h   |  4 ++++
 src/plugins/qnx/qnxplugin.cpp                      |  1 +
 3 files changed, 18 insertions(+)

diff --git a/src/plugins/qnx/blackberryconfigurationmanager.cpp b/src/plugins/qnx/blackberryconfigurationmanager.cpp
index 2895710e520..687b43fa6f5 100644
--- a/src/plugins/qnx/blackberryconfigurationmanager.cpp
+++ b/src/plugins/qnx/blackberryconfigurationmanager.cpp
@@ -258,6 +258,19 @@ void BlackBerryConfigurationManager::emitSettingsChanged()
     emit settingsChanged();
 }
 
+#ifdef WITH_TESTS
+void BlackBerryConfigurationManager::initUnitTest()
+{
+    foreach (BlackBerryApiLevelConfiguration *apiLevel, m_apiLevels)
+        removeApiLevel(apiLevel);
+
+    foreach (BlackBerryRuntimeConfiguration *runtime, m_runtimes)
+        removeRuntime(runtime);
+
+    m_defaultConfiguration = 0;
+}
+#endif
+
 void BlackBerryConfigurationManager::setKitsAutoDetectionSource()
 {
     foreach (Kit *kit, KitManager::kits()) {
diff --git a/src/plugins/qnx/blackberryconfigurationmanager.h b/src/plugins/qnx/blackberryconfigurationmanager.h
index 823bece6b08..c21fc087327 100644
--- a/src/plugins/qnx/blackberryconfigurationmanager.h
+++ b/src/plugins/qnx/blackberryconfigurationmanager.h
@@ -82,6 +82,10 @@ public:
 
     void emitSettingsChanged();
 
+#ifdef WITH_TESTS
+    void initUnitTest();
+#endif
+
 public slots:
     void loadSettings();
     void saveSettings();
diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index 8e54c26a666..426d5f30c26 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -482,6 +482,7 @@ void QnxPlugin::testConfigurationManager_data()
 void QnxPlugin::testConfigurationManager()
 {
     BlackBerryConfigurationManager *manager = BlackBerryConfigurationManager::instance();
+    manager->initUnitTest();
 
     QCOMPARE(manager->apiLevels().count(), 0);
     QCOMPARE(manager->activeApiLevels().count(), 0);