Update unit tests for new dialog

src/FactSystem/FactSystemTestBase.cc

@@ -30,6 +30,7 @@
 #include "AutoPilotPluginManager.h"
 #include "UASManager.h"
 #include "QGCApplication.h"
+#include "QGCMessageBox.h"
 #include "QGCQuickWidget.h"
 
 #include <QQuickItem>
@@ -49,6 +50,11 @@ void FactSystemTestBase::_init(MAV_AUTOPILOT autopilot)
     MockLink* link = new MockLink();
     link->setAutopilotType(autopilot);
     _linkMgr->_addLink(link);
+    
+    if (autopilot == MAV_AUTOPILOT_ARDUPILOTMEGA) {
+        // Connect will pop a warning dialog
+        setExpectedMessageBox(QGCMessageBox::Ok);
+    }
     _linkMgr->connectLink(link);
     
     // Wait for the uas to work it's way through the various threads
@@ -56,6 +62,10 @@ void FactSystemTestBase::_init(MAV_AUTOPILOT autopilot)
     QSignalSpy spyUas(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)));
     QCOMPARE(spyUas.wait(5000), true);
     
+    if (autopilot == MAV_AUTOPILOT_ARDUPILOTMEGA) {
+        checkExpectedMessageBox();
+    }
+    
     _uas = UASManager::instance()->getActiveUAS();
     Q_ASSERT(_uas);
     

src/qgcunittest/MainWindowTest.cc

@@ -67,6 +67,11 @@ void MainWindowTest::_connectWindowClose_test(MAV_AUTOPILOT autopilot)
     Q_CHECK_PTR(link);
     link->setAutopilotType(autopilot);
     LinkManager::instance()->_addLink(link);
+    
+    if (autopilot == MAV_AUTOPILOT_ARDUPILOTMEGA) {
+        // Connect will pop a warning dialog
+        setExpectedMessageBox(QGCMessageBox::Ok);
+    }
     linkMgr->connectLink(link);
     
     // Wait for the uas to work it's way through the various threads
@@ -74,6 +79,10 @@ void MainWindowTest::_connectWindowClose_test(MAV_AUTOPILOT autopilot)
     QSignalSpy spyUas(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)));
     QCOMPARE(spyUas.wait(5000), true);
     
+    if (autopilot == MAV_AUTOPILOT_ARDUPILOTMEGA) {
+        checkExpectedMessageBox();
+    }
+    
     // Cycle through all the top level views
     
     _mainToolBar->onSetupView();