From 95f9e435f76a7ff5eee91a17f5af26f1cfc719c5 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 3 Mar 2018 17:28:48 +0100 Subject: [PATCH] Ref T259, Ref T243 renamed unit test to CTestInterpolatorLinear --- ...estinterpolator.cpp => testinterpolatorlinear.cpp} | 8 ++++---- .../{testinterpolator.h => testinterpolatorlinear.h} | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) rename tests/blackmisc/{testinterpolator.cpp => testinterpolatorlinear.cpp} (95%) rename tests/blackmisc/{testinterpolator.h => testinterpolatorlinear.h} (83%) diff --git a/tests/blackmisc/testinterpolator.cpp b/tests/blackmisc/testinterpolatorlinear.cpp similarity index 95% rename from tests/blackmisc/testinterpolator.cpp rename to tests/blackmisc/testinterpolatorlinear.cpp index 52ecbf1f2..fbd3805c7 100644 --- a/tests/blackmisc/testinterpolator.cpp +++ b/tests/blackmisc/testinterpolatorlinear.cpp @@ -14,7 +14,7 @@ * \ingroup testblackmisc */ -#include "testinterpolator.h" +#include "testinterpolatorlinear.h" #include "blackmisc/aviation/aircraftengine.h" #include "blackmisc/aviation/aircraftenginelist.h" #include "blackmisc/aviation/aircraftlights.h" @@ -53,7 +53,7 @@ using namespace BlackMisc::Simulation; namespace BlackMiscTest { - void CTestInterpolator::linearInterpolator() + void CTestInterpolatorLinear::basicInterpolatorTests() { CCallsign cs("SWIFT"); CInterpolatorLinear interpolator(cs); @@ -154,7 +154,7 @@ namespace BlackMiscTest qDebug() << timeMs << "ms" << "for" << fetchedParts << "fetched parts"; } - CAircraftSituation CTestInterpolator::getTestSituation(const CCallsign &callsign, int number, qint64 ts, qint64 deltaT, qint64 offset) + CAircraftSituation CTestInterpolatorLinear::getTestSituation(const CCallsign &callsign, int number, qint64 ts, qint64 deltaT, qint64 offset) { const CAltitude alt(number, CAltitude::MeanSeaLevel, CLengthUnit::m()); const CLatitude lat(number, CAngleUnit::deg()); @@ -171,7 +171,7 @@ namespace BlackMiscTest return s; } - CAircraftParts CTestInterpolator::getTestParts(int number, qint64 ts, qint64 deltaT) + CAircraftParts CTestInterpolatorLinear::getTestParts(int number, qint64 ts, qint64 deltaT) { CAircraftLights l(true, false, true, false, true, false); CAircraftEngineList e({ CAircraftEngine(1, true), CAircraftEngine(2, false), CAircraftEngine(3, true) }); diff --git a/tests/blackmisc/testinterpolator.h b/tests/blackmisc/testinterpolatorlinear.h similarity index 83% rename from tests/blackmisc/testinterpolator.h rename to tests/blackmisc/testinterpolatorlinear.h index 3f55f5104..ee7fc0d9d 100644 --- a/tests/blackmisc/testinterpolator.h +++ b/tests/blackmisc/testinterpolatorlinear.h @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#ifndef BLACKMISCTEST_TESTINTERPOLATOR_H -#define BLACKMISCTEST_TESTINTERPOLATOR_H +#ifndef BLACKMISCTEST_TESTINTERPOLATORLINEAR_H +#define BLACKMISCTEST_TESTINTERPOLATORLINEAR_H //! \cond PRIVATE_TESTS @@ -19,7 +19,6 @@ #include "blackmisc/aviation/aircraftparts.h" #include "blackmisc/aviation/aircraftsituation.h" - #include #include @@ -29,17 +28,17 @@ namespace BlackMiscTest /*! * Interpolator classes basic tests */ - class CTestInterpolator : public QObject + class CTestInterpolatorLinear : public QObject { Q_OBJECT public: //! Standard test case constructor - explicit CTestInterpolator(QObject *parent = nullptr) : QObject(parent) {} + explicit CTestInterpolatorLinear(QObject *parent = nullptr) : QObject(parent) {} private slots: //! Basic unit tests for interpolator - void linearInterpolator(); + void basicInterpolatorTests(); private: //! Test situation for testing