diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-18 20:14:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-18 20:14:01 +0300 |
| commit | dffd0a4a8e99196ad27f8fde2430b09dd29cac57 (patch) | |
| tree | c9e4b9401844577805731686448a33bba1f10c2d /src/resources | |
| parent | 7b3cf825ebf4f87cb6b1bf7c0a2107c4b2774766 (diff) | |
| download | plus-dffd0a4a8e99196ad27f8fde2430b09dd29cac57.tar.gz plus-dffd0a4a8e99196ad27f8fde2430b09dd29cac57.tar.bz2 plus-dffd0a4a8e99196ad27f8fde2430b09dd29cac57.tar.xz plus-dffd0a4a8e99196ad27f8fde2430b09dd29cac57.zip | |
Move catch.hpp into test directory.
Also replace include catch.hpp into generic unittests.h
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/dye/dye_unittest.cc | 2 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_unittest.cc | 2 | ||||
| -rw-r--r-- | src/resources/map/maplayer_unittest.cc | 3 | ||||
| -rw-r--r-- | src/resources/map/speciallayer_unittest.cc | 3 | ||||
| -rw-r--r-- | src/resources/mstack_unittest.cc | 2 | ||||
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager_unittest.cc | 3 | ||||
| -rw-r--r-- | src/resources/sprite/animatedsprite_unittest.cc | 5 |
7 files changed, 12 insertions, 8 deletions
diff --git a/src/resources/dye/dye_unittest.cc b/src/resources/dye/dye_unittest.cc index b21b03016..7ea5793b6 100644 --- a/src/resources/dye/dye_unittest.cc +++ b/src/resources/dye/dye_unittest.cc @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "catch.hpp" +#include "test/unittests.h" #include "client.h" #include "graphicsmanager.h" diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc index 338e7c23d..afa3d8878 100644 --- a/src/resources/dye/dyepalette_unittest.cc +++ b/src/resources/dye/dyepalette_unittest.cc @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "catch.hpp" +#include "test/unittests.h" #include "client.h" #include "configuration.h" diff --git a/src/resources/map/maplayer_unittest.cc b/src/resources/map/maplayer_unittest.cc index 1d9b515f7..692a4738f 100644 --- a/src/resources/map/maplayer_unittest.cc +++ b/src/resources/map/maplayer_unittest.cc @@ -18,7 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "catch.hpp" +#include "test/unittests.h" + #include "graphicsmanager.h" #include "being/localplayer.h" diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc index 57dc3b98b..fea93e801 100644 --- a/src/resources/map/speciallayer_unittest.cc +++ b/src/resources/map/speciallayer_unittest.cc @@ -18,7 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "catch.hpp" +#include "test/unittests.h" + #include "client.h" #include "logger.h" diff --git a/src/resources/mstack_unittest.cc b/src/resources/mstack_unittest.cc index 02d14f215..305aee15f 100644 --- a/src/resources/mstack_unittest.cc +++ b/src/resources/mstack_unittest.cc @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "catch.hpp" +#include "test/unittests.h" #include "gui/cliprect.h" diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc index 2595beb76..527274ae9 100644 --- a/src/resources/resourcemanager/resourcemanager_unittest.cc +++ b/src/resources/resourcemanager/resourcemanager_unittest.cc @@ -18,7 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "catch.hpp" +#include "test/unittests.h" + #include "client.h" #include "dirs.h" #include "logger.h" diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc index 4f8053b57..dabadd21b 100644 --- a/src/resources/sprite/animatedsprite_unittest.cc +++ b/src/resources/sprite/animatedsprite_unittest.cc @@ -18,9 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/sprite/animatedsprite.h" +#include "test/unittests.h" -#include "catch.hpp" #include "configuration.h" #include "configmanager.h" #include "client.h" @@ -44,6 +43,8 @@ #include "resources/resourcemanager/resourcemanager.h" +#include "resources/sprite/animatedsprite.h" + #include "utils/env.h" #include "utils/delete2.h" #include "utils/mrand.h" |