style changes and removals of typeid

refs #81
This commit is contained in:
Klaus Basan
2013-12-22 20:28:56 +00:00
committed by Mathew Sutcliffe
parent 229d7c6068
commit 978f3c88e5
73 changed files with 7356 additions and 7130 deletions

View File

@@ -11,72 +11,72 @@ using namespace BlackMisc::PhysicalQuantities;
namespace BlackMiscTest
{
/*
* Constructor
*/
CTestAviation::CTestAviation(QObject *parent): QObject(parent)
{
// void
}
/*
* Constructor
*/
CTestAviation::CTestAviation(QObject *parent): QObject(parent)
{
// void
}
/*
* Basic tests
*/
void CTestAviation::headingBasics()
{
CHeading h1(180, CHeading::Magnetic, CAngleUnit::deg());
CHeading h2(180, CHeading::True, CAngleUnit::deg());
CHeading h3(181, CHeading::Magnetic, CAngleUnit::deg());
CAngle a1(200, CAngleUnit::deg());
CHeading h4;
h4 = h1;
QVERIFY2(h1 != h2, "Magnetic and true heading are not the same");
QVERIFY2(h1 < h3, "180deg are less than 181deg");
QVERIFY2(h3 > h1, "181deg are more than 181deg");
QVERIFY2(a1 > h3, "200deg are more than 181deg");
QVERIFY2(h4 == h1, "Values shall be equal");
/*
* Basic tests
*/
void CTestAviation::headingBasics()
{
CHeading h1(180, CHeading::Magnetic, CAngleUnit::deg());
CHeading h2(180, CHeading::True, CAngleUnit::deg());
CHeading h3(181, CHeading::Magnetic, CAngleUnit::deg());
CAngle a1(200, CAngleUnit::deg());
CHeading h4;
h4 = h1;
QVERIFY2(h1 != h2, "Magnetic and true heading are not the same");
QVERIFY2(h1 < h3, "180deg are less than 181deg");
QVERIFY2(h3 > h1, "181deg are more than 181deg");
QVERIFY2(a1 > h3, "200deg are more than 181deg");
QVERIFY2(h4 == h1, "Values shall be equal");
h1 -= h1;
QVERIFY2(h1.value() == 0, "Value shall be 0");
h1 -= h1;
QVERIFY2(h1.value() == 0, "Value shall be 0");
// h4 = h1 + h2; does not work, because misleading
h2 += h2; // add just angle
QVERIFY2(h2.value() == 360, "Value shall be 360");
}
// h4 = h1 + h2; does not work, because misleading
h2 += h2; // add just angle
QVERIFY2(h2.value() == 360, "Value shall be 360");
}
/*
* COM and NAV units
*/
void CTestAviation::comAndNav()
{
CComSystem c1 = CComSystem::getCom1System(122.8);
CComSystem c2 = CComSystem::getCom2System(122.8);
QVERIFY2(c1 != c2, "COM system shall not be equal");
c1 = c2;
QVERIFY2(c1 == c2, "COM system shall be equal");
CFrequency f(100.0, CFrequencyUnit::MHz());
QVERIFY2(!CComSystem::tryGetComSystem(c1, "no valid unit", f), "Expect not to get COM system");
CNavSystem nav1;
QVERIFY2(CNavSystem::tryGetNav1System(nav1, 110.0), "Expect NAV system");
QVERIFY2(!CNavSystem::tryGetNav1System(nav1, 200.0), "Expect no NAV system");
}
/*
* COM and NAV units
*/
void CTestAviation::comAndNav()
{
CComSystem c1 = CComSystem::getCom1System(122.8);
CComSystem c2 = CComSystem::getCom2System(122.8);
QVERIFY2(c1 != c2, "COM system shall not be equal");
c1 = c2;
QVERIFY2(c1 == c2, "COM system shall be equal");
CFrequency f(100.0, CFrequencyUnit::MHz());
QVERIFY2(!CComSystem::tryGetComSystem(c1, "no valid unit", f), "Expect not to get COM system");
CNavSystem nav1;
QVERIFY2(CNavSystem::tryGetNav1System(nav1, 110.0), "Expect NAV system");
QVERIFY2(!CNavSystem::tryGetNav1System(nav1, 200.0), "Expect no NAV system");
}
/*
* COM and NAV units
*/
void CTestAviation::transponder()
{
CTransponder t1 = CTransponder::getStandardTransponder(7000, CTransponder::StateStandby);
CTransponder t2 = t1;
QVERIFY2(t1 == t2, "Transponders shall be equal");
t2.setTransponderMode(CTransponder::ModeC);
QVERIFY2(t1 != t2, "Transponders shall not be equal");
QVERIFY2(!CTransponder::tryGetStandardTransponder(t1, 8888, CTransponder::StateStandby), "No valid transponder");
QVERIFY2(!CTransponder::tryGetStandardTransponder(t1, 781, CTransponder::StateStandby), "No valid transponder");
QVERIFY2(!CTransponder::tryGetStandardTransponder(t1, "0781", CTransponder::StateStandby), "No valid transponder");
QVERIFY2(CTransponder::tryGetStandardTransponder(t1, "7211", CTransponder::StateStandby), "No valid transponder");
QVERIFY2(!CTransponder::tryGetStandardTransponder(t1, "schnitzel", CTransponder::StateStandby), "No valid transponder");
/*
* COM and NAV units
*/
void CTestAviation::transponder()
{
CTransponder t1 = CTransponder::getStandardTransponder(7000, CTransponder::StateStandby);
CTransponder t2 = t1;
QVERIFY2(t1 == t2, "Transponders shall be equal");
t2.setTransponderMode(CTransponder::ModeC);
QVERIFY2(t1 != t2, "Transponders shall not be equal");
QVERIFY2(!CTransponder::tryGetStandardTransponder(t1, 8888, CTransponder::StateStandby), "No valid transponder");
QVERIFY2(!CTransponder::tryGetStandardTransponder(t1, 781, CTransponder::StateStandby), "No valid transponder");
QVERIFY2(!CTransponder::tryGetStandardTransponder(t1, "0781", CTransponder::StateStandby), "No valid transponder");
QVERIFY2(CTransponder::tryGetStandardTransponder(t1, "7211", CTransponder::StateStandby), "No valid transponder");
QVERIFY2(!CTransponder::tryGetStandardTransponder(t1, "schnitzel", CTransponder::StateStandby), "No valid transponder");
}
}
} // namespace

View File

@@ -16,35 +16,35 @@
namespace BlackMiscTest
{
/*!
* \brief Aviation classes basic tests
*/
class CTestAviation : public QObject
{
Q_OBJECT
/*!
* \brief Aviation classes basic tests
*/
class CTestAviation : public QObject
{
Q_OBJECT
public:
/*!
* \brief Standard test case constructor
* \param parent
*/
explicit CTestAviation(QObject *parent = 0);
public:
/*!
* \brief Standard test case constructor
* \param parent
*/
explicit CTestAviation(QObject *parent = 0);
private slots:
/*!
* \brief Basic unit tests for physical units
*/
void headingBasics();
/*!
* \brief COM and NAV units
*/
void comAndNav();
private slots:
/*!
* \brief Basic unit tests for physical units
*/
void headingBasics();
/*!
* \brief COM and NAV units
*/
void comAndNav();
/*!
* \brief Transponder
*/
void transponder();
/*!
* \brief Transponder
*/
void transponder();
};
} // namespace

View File

@@ -7,22 +7,23 @@
namespace BlackMiscTest
{
/*
* Starting main, equivalent to QTEST_APPLESS_MAIN for multiple test classes.
*/
int CBlackMiscTestMain::unitMain(int argc, char *argv[])
{
int status = 0;
/*
* Starting main, equivalent to QTEST_APPLESS_MAIN for multiple test classes.
*/
int CBlackMiscTestMain::unitMain(int argc, char *argv[])
{
CTestPhysicalQuantities pqBaseTests ;
CTestAviation avBaseTests;
CTestVectorMatrix vmTests;
CTestGeo geoTests;
status |= QTest::qExec(&pqBaseTests, argc, argv);
status |= QTest::qExec(&avBaseTests, argc, argv);
status |= QTest::qExec(&vmTests, argc, argv);
status |= QTest::qExec(&geoTests, argc, argv);
int status = 0;
{
CTestPhysicalQuantities pqBaseTests ;
CTestAviation avBaseTests;
CTestVectorMatrix vmTests;
CTestGeo geoTests;
status |= QTest::qExec(&pqBaseTests, argc, argv);
status |= QTest::qExec(&avBaseTests, argc, argv);
status |= QTest::qExec(&vmTests, argc, argv);
status |= QTest::qExec(&geoTests, argc, argv);
}
return status;
}
return status;
}
} // namespace

View File

@@ -91,4 +91,4 @@ private slots:
} // namespace
#endif // BLACKMISCTEST_TESTPHYSICALQUANTITIESBASE_H
#endif // guard