flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-29 20:55:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #197, unit test and preliminary fix for nullUnit comparison

Browse Source
This commit is contained in:
Klaus Basan
2014-03-27 01:16:14 +01:00
parent 5bdb8659ca
commit d4f1221665
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackmisc/pqphysicalquantity.cpp
View File

@@ -36,6 +36,7 @@ namespace BlackMisc
template <class MU, class PQ> bool CPhysicalQuantity<MU, PQ>::operator ==(const CPhysicalQuantity<MU, PQ> &other) const template <class MU, class PQ> bool CPhysicalQuantity<MU, PQ>::operator ==(const CPhysicalQuantity<MU, PQ> &other) const
{ {
if (this == &other) return true; if (this == &other) return true;
if (this->isNull() && other.isNull()) return true; // preliminary fix
double diff = std::abs(this->m_value - other.value(this->m_unit)); double diff = std::abs(this->m_value - other.value(this->m_unit));
return diff <= this->m_unit.getEpsilon(); return diff <= this->m_unit.getEpsilon();
} }

9
tests/blackmisc/testvariantandmap.cpp
View File

@@ -6,6 +6,7 @@
#include "testvariantandmap.h" #include "testvariantandmap.h"
#include "blackmisc/avatcstation.h" #include "blackmisc/avatcstation.h"
#include "blackmisc/valuemap.h" #include "blackmisc/valuemap.h"
#include "blackmisc/tuple.h"
#include <QList> #include <QList>
#include <QString> #include <QString>
#include <vector> #include <vector>
@@ -39,8 +40,16 @@ namespace BlackMiscTest
geoPos, CLength(100, CLengthUnit::km()), false, dtFrom2, dtUntil2); geoPos, CLength(100, CLengthUnit::km()), false, dtFrom2, dtUntil2);
// compare // compare
CLength l1(0, CLengthUnit::nullUnit());
CLength l2(0, CLengthUnit::nullUnit());
QVERIFY2(l1 == l2, "Null lengths should be equal");
QVariant station1qv = QVariant::fromValue(station1); QVariant station1qv = QVariant::fromValue(station1);
QVERIFY2(station1 == station1, "Station should be equal"); QVERIFY2(station1 == station1, "Station should be equal");
QVERIFY(station1.getController() == station2.getController());
QVERIFY(station1.getDistanceToPlane() == station2.getDistanceToPlane());
QVERIFY2(station1 == station2, "Station should be equal"); QVERIFY2(station1 == station2, "Station should be equal");
QVERIFY2(station1 != station3, "Station should not be equal"); QVERIFY2(station1 != station3, "Station should not be equal");
QVERIFY2(station1qv == station1, "Station should be equal (QVariant)"); QVERIFY2(station1qv == station1, "Station should be equal (QVariant)");