Merge pull request #5049 from DonLakeFlyer/UnitTestFixes

UT fixes and code fixes for found bugs

src/MissionManager/MissionControllerManagerTest.cc

@@ -36,6 +36,7 @@ void MissionControllerManagerTest::_initForFirmwareType(MAV_AUTOPILOT firmwareTy
     QVERIFY(_missionManager);
     
     _rgMissionManagerSignals[newMissionItemsAvailableSignalIndex] = SIGNAL(newMissionItemsAvailable(bool));
+    _rgMissionManagerSignals[sendCompleteSignalIndex] =             SIGNAL(sendComplete(void));
     _rgMissionManagerSignals[inProgressChangedSignalIndex] =        SIGNAL(inProgressChanged(bool));
     _rgMissionManagerSignals[errorSignalIndex] =                    SIGNAL(error(int, const QString&));
 

src/MissionManager/MissionControllerManagerTest.h

@@ -55,6 +55,7 @@ protected:
 
     typedef enum {
         newMissionItemsAvailableSignalIndex = 0,
+        sendCompleteSignalIndex,
         inProgressChangedSignalIndex,
         errorSignalIndex,
         maxSignalIndex
@@ -62,6 +63,7 @@ protected:
 
     typedef enum {
         newMissionItemsAvailableSignalMask =    1 << newMissionItemsAvailableSignalIndex,
+        sendCompleteSignalMask =                1 << sendCompleteSignalIndex,
         inProgressChangedSignalMask =           1 << inProgressChangedSignalIndex,
         errorSignalMask =                       1 << errorSignalIndex,
     } MissionManagerSignalMask_t;

src/MissionManager/MissionManager.cc

@@ -868,8 +868,9 @@ void MissionManager::_finishTransaction(bool success)
     // First thing we do is clear the transaction. This way inProgesss is off when we signal transaction complete.
     TransactionType_t currentTransactionType = _transactionInProgress;
     _transactionInProgress = TransactionNone;
-    if (_transactionInProgress != TransactionNone) {
+    if (currentTransactionType != TransactionNone) {
         _transactionInProgress = TransactionNone;
+        qDebug() << "inProgressChanged";
         emit inProgressChanged(false);
     }
 

src/MissionManager/MissionManagerTest.cc

@@ -60,9 +60,8 @@ void MissionManagerTest::_writeItems(MockLinkMissionItemHandler::FailureMode_t f
     
     // writeMissionItems should emit these signals before returning:
     //      inProgressChanged
-    //      newMissionItemsAvailable
     QVERIFY(_missionManager->inProgress());
-    QCOMPARE(_multiSpyMissionManager->checkSignalByMask(inProgressChangedSignalMask | newMissionItemsAvailableSignalMask), true);
+    QCOMPARE(_multiSpyMissionManager->checkSignalByMask(inProgressChangedSignalMask), true);
     _checkInProgressValues(true);
     
     _multiSpyMissionManager->clearAllSignals();
@@ -93,8 +92,9 @@ void MissionManagerTest::_writeItems(MockLinkMissionItemHandler::FailureMode_t f
 
         // Wait for write sequence to complete. We should get:
         //      inProgressChanged(false) signal
-        _multiSpyMissionManager->waitForSignalByIndex(inProgressChangedSignalIndex, _missionManagerSignalWaitTime);
-        QCOMPARE(_multiSpyMissionManager->checkOnlySignalByMask(inProgressChangedSignalMask), true);
+        //      sednComplete signal
+        _multiSpyMissionManager->waitForSignalByIndex(sendCompleteSignalIndex, _missionManagerSignalWaitTime);
+        QCOMPARE(_multiSpyMissionManager->checkSignalByMask(inProgressChangedSignalMask | sendCompleteSignalMask), true);
 
         // Validate inProgressChanged signal value
         _checkInProgressValues(false);