From 64f20f014186db6ce64db7e7f0ae243e4f7d9583 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Tue, 7 Feb 2017 15:31:50 +0000 Subject: [PATCH] refs #863 Fixed wrong test that had been masked by CRemoteAircraftProviderDummy being too clever. --- src/blackmisc/simulation/remoteaircraftproviderdummy.cpp | 2 -- tests/blackmisc/testinterpolator.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp index 1d100667b..9f5036eb7 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp @@ -188,14 +188,12 @@ namespace BlackMisc void CRemoteAircraftProviderDummy::insertNewSituation(const CAircraftSituation &situation) { this->m_situations.push_front(situation); - this->m_situations.sortLatestFirst(); // like in real world, latest should be first emit addedRemoteAircraftSituation(situation); } void CRemoteAircraftProviderDummy::insertNewAircraftParts(const CCallsign &callsign, const CAircraftParts &parts) { this->m_parts[callsign].push_front(parts); - this->m_parts[callsign].sortLatestFirst(); // like in real world, latest should be first emit addedRemoteAircraftParts(callsign, parts); } diff --git a/tests/blackmisc/testinterpolator.cpp b/tests/blackmisc/testinterpolator.cpp index d4a8ace28..ba7525ef6 100644 --- a/tests/blackmisc/testinterpolator.cpp +++ b/tests/blackmisc/testinterpolator.cpp @@ -63,7 +63,7 @@ namespace BlackMiscTest const qint64 ts = 1425000000000; // QDateTime::currentMSecsSinceEpoch(); const qint64 deltaT = 5000; // ms const qint64 offset = 5000; - for (int i = 0; i < IRemoteAircraftProvider::MaxSituationsPerCallsign; i++) + for (int i = IRemoteAircraftProvider::MaxSituationsPerCallsign - 1; i >= 0; i--) { CAircraftSituation s(getTestSituation(cs, i, ts, deltaT, offset)); @@ -74,7 +74,7 @@ namespace BlackMiscTest } constexpr int partsCount = 10; - for (int i = 0; i < partsCount; i++) + for (int i = partsCount - 1; i >= 0; i--) { CAircraftParts p(getTestParts(i, ts, deltaT)); interpolator.addAircraftParts(p);