From 062289bc69f407126b490983b61f08441f8aee5e Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Fri, 16 Dec 2016 04:35:52 +0000 Subject: [PATCH] refs #838 Move interpolator unittest from testblackcore to testblackmisc. --- tests/blackcore/testblackcoremain.cpp | 5 ----- tests/blackmisc/testblackmiscmain.cpp | 5 +++++ tests/{blackcore => blackmisc}/testinterpolator.cpp | 4 ++-- tests/{blackcore => blackmisc}/testinterpolator.h | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) rename tests/{blackcore => blackmisc}/testinterpolator.cpp (99%) rename tests/{blackcore => blackmisc}/testinterpolator.h (91%) diff --git a/tests/blackcore/testblackcoremain.cpp b/tests/blackcore/testblackcoremain.cpp index cf08e31c3..6db02615e 100644 --- a/tests/blackcore/testblackcoremain.cpp +++ b/tests/blackcore/testblackcoremain.cpp @@ -15,7 +15,6 @@ */ #include "testblackcoremain.h" -#include "testinterpolator.h" #include "testnetwork.h" #include "testreaders.h" #include "blackmisc/test.h" @@ -30,10 +29,6 @@ namespace BlackCoreTest BlackMisc::CTest test(argc, argv); int status = 0; - { - CTestInterpolator interpolatorTests; - status |= test.exec(&interpolatorTests, "blackcore_interpolator"); - } { CTestReaders readersTests; status |= test.exec(&readersTests, "blackcore_readers"); diff --git a/tests/blackmisc/testblackmiscmain.cpp b/tests/blackmisc/testblackmiscmain.cpp index 314951321..9f14f3bab 100644 --- a/tests/blackmisc/testblackmiscmain.cpp +++ b/tests/blackmisc/testblackmiscmain.cpp @@ -20,6 +20,7 @@ #include "testgeo.h" #include "testidentifier.h" #include "testinput.h" +#include "testinterpolator.h" #include "testlibrarypath.h" #include "testmath.h" #include "testphysicalquantities.h" @@ -92,6 +93,10 @@ namespace BlackMiscTest CTestMath mathTests; status |= test.exec(&mathTests, "blackmisc_math"); } + { + CTestInterpolator interpolatorTests; + status |= test.exec(&interpolatorTests, "blackmisc_interpolator"); + } { CTestLibraryPath libraryPathTests; status |= test.exec(&libraryPathTests, "blackmisc_librarypath"); diff --git a/tests/blackcore/testinterpolator.cpp b/tests/blackmisc/testinterpolator.cpp similarity index 99% rename from tests/blackcore/testinterpolator.cpp rename to tests/blackmisc/testinterpolator.cpp index 5cb3e0214..a544e18e2 100644 --- a/tests/blackcore/testinterpolator.cpp +++ b/tests/blackmisc/testinterpolator.cpp @@ -11,7 +11,7 @@ /*! * \file - * \ingroup testblackcore + * \ingroup testblackmisc */ #include "testinterpolator.h" @@ -51,7 +51,7 @@ using namespace BlackMisc::Geo; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Simulation; -namespace BlackCoreTest +namespace BlackMiscTest { void CTestInterpolator::linearInterpolator() diff --git a/tests/blackcore/testinterpolator.h b/tests/blackmisc/testinterpolator.h similarity index 91% rename from tests/blackcore/testinterpolator.h rename to tests/blackmisc/testinterpolator.h index b62418021..c98d78f11 100644 --- a/tests/blackcore/testinterpolator.h +++ b/tests/blackmisc/testinterpolator.h @@ -7,14 +7,14 @@ * contained in the LICENSE file. */ -#ifndef BLACKCORETEST_TESTINTERPOLATOR_H -#define BLACKCORETEST_TESTINTERPOLATOR_H +#ifndef BLACKMISCTEST_TESTINTERPOLATOR_H +#define BLACKMISCTEST_TESTINTERPOLATOR_H //! \cond PRIVATE_TESTS /*! * \file - * \ingroup testblackcore + * \ingroup testblackmisc */ #include "blackmisc/aviation/aircraftparts.h" @@ -25,7 +25,7 @@ namespace BlackMisc { namespace Aviation { class CCallsign; } } -namespace BlackCoreTest +namespace BlackMiscTest { /*!