Merge pull request #2378 from DonLakeFlyer/MissionManagerTest

Mission manager test back on

src/QGCApplication.cc

@@ -746,17 +746,37 @@ QObject* QGCApplication::_rootQmlObject(void)
 #ifdef __mobile__
     return _qmlAppEngine->rootObjects()[0];
 #else
-    return MainWindow::instance()->rootQmlObject();
+    MainWindow * mainWindow = MainWindow::instance();
+    if (mainWindow) {
+        return mainWindow->rootQmlObject();
+    } else if (runningUnitTests()){
+        // Unit test can run without a main window
+        return NULL;
+    } else {
+        qWarning() << "Why is MainWindow missing?";
+        return NULL;
+    }
 #endif
 }
 
 
 void QGCApplication::showMessage(const QString& message)
 {
-    QVariant varReturn;
-    QVariant varMessage = QVariant::fromValue(message);
+    QObject* rootQmlObject = _rootQmlObject();
+
+    if (rootQmlObject) {
+        QVariant varReturn;
+        QVariant varMessage = QVariant::fromValue(message);
 
-    QMetaObject::invokeMethod(_rootQmlObject(), "showMessage", Q_RETURN_ARG(QVariant, varReturn), Q_ARG(QVariant, varMessage));
+        QMetaObject::invokeMethod(_rootQmlObject(), "showMessage", Q_RETURN_ARG(QVariant, varReturn), Q_ARG(QVariant, varMessage));
+#ifndef __mobile__
+    } else if (runningUnitTests()){
+        // Unit test can run without a main window which will lead to no root qml object. Use QGCMessageBox instead
+        QGCMessageBox::information("Unit Test", message);
+#endif
+    } else {
+        qWarning() << "Internal error";
+    }
 }
 
 void QGCApplication::showFlyView(void)

src/qgcunittest/UnitTestList.cc

@@ -33,6 +33,7 @@
 #include "MessageBoxTest.h"
 #include "MissionItemTest.h"
 #include "MissionControllerTest.h"
+#include "MissionManagerTest.h"
 #include "RadioConfigTest.h"
 #include "SetupViewTest.h"
 #include "MavlinkLogTest.h"
@@ -48,6 +49,7 @@ UT_REGISTER_TEST(MavlinkLogTest)
 UT_REGISTER_TEST(MessageBoxTest)
 UT_REGISTER_TEST(MissionItemTest)
 UT_REGISTER_TEST(MissionControllerTest)
+UT_REGISTER_TEST(MissionManagerTest)
 UT_REGISTER_TEST(RadioConfigTest)
 
 // List of unit test which are currently disabled.
@@ -59,11 +61,6 @@ UT_REGISTER_TEST(RadioConfigTest)
 // FIXME: Temporarily disabled until this can be stabilized
 //UT_REGISTER_TEST(MainWindowTest)
 
-// FIXME: Temporarily disabled until this can be stabilized
-
-// FIXME: Temporarily disabled until this can be stabilized
-//UT_REGISTER_TEST(MissionManagerTest)
-
 // This unit test has gotten too flaky to run reliably under TeamCity. Removing for now till there is
 // time to debug.
 //UT_REGISTER_TEST(TCPLinkUnitTest)