Merge pull request #1932 from DonLakeFlyer/MMTimeout

Bump retry timeout to 2 seconds

src/MissionManager/MissionManager.h

@@ -79,6 +79,10 @@ public:
         MissingRequestsError,   ///< Vehicle did not request all items during write sequence
     } ErrorCode_t;
 
+    // These values are public so the unit test can set appropriate signal wait times
+    static const int _ackTimeoutMilliseconds= 2000;
+    static const int _maxRetryCount = 5;
+    
 signals:
     // Public signals
     void canEditChanged(bool canEdit);
@@ -127,9 +131,6 @@ private:
     QMutex _dataMutex;
     
     QmlObjectListModel  _missionItems;
-    
-    static const int _ackTimeoutMilliseconds= 500;
-    static const int _maxRetryCount = 5;
 };
 
 #endif
\ No newline at end of file

src/MissionManager/MissionManagerTest.cc

@@ -77,8 +77,8 @@ void MissionManagerTest::init(void)
     QCOMPARE(_multiSpy->init(_missionManager, _rgSignals, _cSignals), true);
     
     if (_missionManager->inProgress()) {
-        _multiSpy->waitForSignalByIndex(newMissionItemsAvailableSignalIndex, 1000);
-        _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, 1000);
+        _multiSpy->waitForSignalByIndex(newMissionItemsAvailableSignalIndex, _signalWaitTime);
+        _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, _signalWaitTime);
         QCOMPARE(_multiSpy->checkSignalByMask(newMissionItemsAvailableSignalMask | inProgressChangedSignalMask), true);
         QCOMPARE(_multiSpy->checkNoSignalByMask(canEditChangedSignalIndex), true);
     }
@@ -123,8 +123,8 @@ void MissionManagerTest::_readEmptyVehicle(void)
     
     // Now wait for read sequence to complete. We should get both a newMissionItemsAvailable and a
     // inProgressChanged signal to signal completion.
-    _multiSpy->waitForSignalByIndex(newMissionItemsAvailableSignalIndex, 1000);
-    _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, 1000);
+    _multiSpy->waitForSignalByIndex(newMissionItemsAvailableSignalIndex, _signalWaitTime);
+    _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, _signalWaitTime);
     QCOMPARE(_multiSpy->checkSignalByMask(newMissionItemsAvailableSignalMask | inProgressChangedSignalMask), true);
     QCOMPARE(_multiSpy->checkNoSignalByMask(canEditChangedSignalMask), true);
     _checkInProgressValues(false);
@@ -172,7 +172,7 @@ void MissionManagerTest::_writeItems(MockLinkMissionItemHandler::FailureMode_t f
         
         // Wait for write sequence to complete. We should get:
         //      inProgressChanged(false) signal
-        _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, 10000);
+        _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, _signalWaitTime);
         QCOMPARE(_multiSpy->checkOnlySignalByMask(inProgressChangedSignalMask), true);
         
         // Validate inProgressChanged signal value
@@ -186,7 +186,7 @@ void MissionManagerTest::_writeItems(MockLinkMissionItemHandler::FailureMode_t f
         // Wait for write sequence to complete. We should get:
         //      inProgressChanged(false) signal
         //      error(errorCode, QString) signal
-        _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, 10000);
+        _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, _signalWaitTime);
         QCOMPARE(_multiSpy->checkSignalByMask(inProgressChangedSignalMask | errorSignalMask), true);
         
         // Validate inProgressChanged signal value
@@ -258,7 +258,7 @@ void MissionManagerTest::_roundTripItems(MockLinkMissionItemHandler::FailureMode
         // Now wait for read sequence to complete. We should get:
         //      inProgressChanged(false) signal to signal completion
         //      newMissionItemsAvailable signal
-        _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, 10000);
+        _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, _signalWaitTime);
         QCOMPARE(_multiSpy->checkSignalByMask(newMissionItemsAvailableSignalMask | inProgressChangedSignalMask), true);
         QCOMPARE(_multiSpy->checkNoSignalByMask(canEditChangedSignalMask), true);
         _checkInProgressValues(false);
@@ -269,7 +269,7 @@ void MissionManagerTest::_roundTripItems(MockLinkMissionItemHandler::FailureMode
         //      inProgressChanged(false) signal to signal completion
         //      error(errorCode, QString) signal
         //      newMissionItemsAvailable signal
-        _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, 10000);
+        _multiSpy->waitForSignalByIndex(inProgressChangedSignalIndex, _signalWaitTime);
         QCOMPARE(_multiSpy->checkSignalByMask(newMissionItemsAvailableSignalMask | inProgressChangedSignalMask | errorSignalMask), true);
         
         // Validate inProgressChanged signal value

src/MissionManager/MissionManagerTest.h

@@ -91,6 +91,7 @@ private:
     } TestCase_t;
 
     static const TestCase_t _rgTestCases[];
+    static const int        _signalWaitTime = MissionManager::_ackTimeoutMilliseconds * MissionManager::_maxRetryCount * 2;
 };
 
 #endif