From dffd0a4a8e99196ad27f8fde2430b09dd29cac57 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 18 May 2017 20:14:01 +0300 Subject: Move catch.hpp into test directory. Also replace include catch.hpp into generic unittests.h --- src/utils/chatutils_unittest.cc | 3 ++- src/utils/checkutils_unittest.cc | 2 +- src/utils/dumplibs_unittest.cc | 3 ++- src/utils/langs_unittest.cc | 4 ++-- src/utils/mathutils_unittest.cc | 4 ++-- src/utils/parameters_unittest.cc | 2 +- src/utils/stringutils_unittest.cc | 3 ++- src/utils/timer_unittest.cc | 2 +- src/utils/translation/poparser_unittest.cc | 3 ++- src/utils/xml_unittest.cc | 3 ++- src/utils/xmlutils_unittest.cc | 4 ++-- 11 files changed, 19 insertions(+), 14 deletions(-) (limited to 'src/utils') diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc index d07578992..875923d83 100644 --- a/src/utils/chatutils_unittest.cc +++ b/src/utils/chatutils_unittest.cc @@ -18,7 +18,8 @@ * along with this program. If not, see . */ -#include "catch.hpp" +#include "test/unittests.h" + #include "client.h" #include "configuration.h" #include "configmanager.h" diff --git a/src/utils/checkutils_unittest.cc b/src/utils/checkutils_unittest.cc index 270b6df58..a3c101e02 100644 --- a/src/utils/checkutils_unittest.cc +++ b/src/utils/checkutils_unittest.cc @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include "catch.hpp" +#include "test/unittests.h" #include "utils/checkutils.h" #include "utils/delete2.h" diff --git a/src/utils/dumplibs_unittest.cc b/src/utils/dumplibs_unittest.cc index dfe12dbf9..6aef5d933 100644 --- a/src/utils/dumplibs_unittest.cc +++ b/src/utils/dumplibs_unittest.cc @@ -18,7 +18,8 @@ * along with this program. If not, see . */ -#include "catch.hpp" +#include "test/unittests.h" + #include "logger.h" #include "utils/delete2.h" diff --git a/src/utils/langs_unittest.cc b/src/utils/langs_unittest.cc index b6983eb14..b162fc001 100644 --- a/src/utils/langs_unittest.cc +++ b/src/utils/langs_unittest.cc @@ -18,12 +18,12 @@ * along with this program. If not, see . */ -#include "utils/langs.h" +#include "test/unittests.h" -#include "catch.hpp" #include "configuration.h" #include "utils/env.h" +#include "utils/langs.h" #include "debug.h" diff --git a/src/utils/mathutils_unittest.cc b/src/utils/mathutils_unittest.cc index 86551130f..6ec2ce831 100644 --- a/src/utils/mathutils_unittest.cc +++ b/src/utils/mathutils_unittest.cc @@ -18,9 +18,9 @@ * along with this program. If not, see . */ -#include "utils/mathutils.h" +#include "test/unittests.h" -#include "catch.hpp" +#include "utils/mathutils.h" #include "debug.h" diff --git a/src/utils/parameters_unittest.cc b/src/utils/parameters_unittest.cc index f95929220..6030c394e 100644 --- a/src/utils/parameters_unittest.cc +++ b/src/utils/parameters_unittest.cc @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include "catch.hpp" +#include "test/unittests.h" #include "utils/parameters.h" diff --git a/src/utils/stringutils_unittest.cc b/src/utils/stringutils_unittest.cc index 9a99972b3..7a5508298 100644 --- a/src/utils/stringutils_unittest.cc +++ b/src/utils/stringutils_unittest.cc @@ -18,7 +18,8 @@ * along with this program. If not, see . */ -#include "catch.hpp" +#include "test/unittests.h" + #include "configuration.h" #include "logger.h" diff --git a/src/utils/timer_unittest.cc b/src/utils/timer_unittest.cc index 95fddc911..41bfad48c 100644 --- a/src/utils/timer_unittest.cc +++ b/src/utils/timer_unittest.cc @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include "catch.hpp" +#include "test/unittests.h" #include "const/utils/timer.h" diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc index d4cf806dc..812472fb2 100644 --- a/src/utils/translation/poparser_unittest.cc +++ b/src/utils/translation/poparser_unittest.cc @@ -18,7 +18,8 @@ * along with this program. If not, see . */ -#include "catch.hpp" +#include "test/unittests.h" + #include "client.h" #include "configuration.h" #include "configmanager.h" diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc index 41297339c..dd5a2145e 100644 --- a/src/utils/xml_unittest.cc +++ b/src/utils/xml_unittest.cc @@ -18,7 +18,8 @@ * along with this program. If not, see . */ -#include "catch.hpp" +#include "test/unittests.h" + #include "client.h" #include "configuration.h" #include "configmanager.h" diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc index 3d9983d7e..eaf3097f3 100644 --- a/src/utils/xmlutils_unittest.cc +++ b/src/utils/xmlutils_unittest.cc @@ -18,9 +18,8 @@ * along with this program. If not, see . */ -#include "utils/xmlutils.h" +#include "test/unittests.h" -#include "catch.hpp" #include "client.h" #include "graphicsmanager.h" @@ -31,6 +30,7 @@ #include "gui/gui.h" #include "utils/delete2.h" +#include "utils/xmlutils.h" #include "render/sdlgraphics.h" -- cgit v1.2.3-70-g09d2