From 220ac9e1ca40c9a7d5af104cfaa110397d3e12d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 19 Jan 2013 22:00:29 +0100 Subject: [PATCH] Removed header files from tests. Following decisions made in Magnum itself. --- .../TgaImporter/Test/TgaImporterTest.cpp | 21 ++++++++--- .../TgaImporter/Test/TgaImporterTest.h | 37 ------------------- 2 files changed, 16 insertions(+), 42 deletions(-) delete mode 100644 src/Plugins/TgaImporter/Test/TgaImporterTest.h diff --git a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp index 8a6527fc1..97a308bdf 100644 --- a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp +++ b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp @@ -13,10 +13,8 @@ GNU Lesser General Public License version 3 for more details. */ -#include "TgaImporterTest.h" - #include -#include +#include #include #include @@ -24,10 +22,21 @@ using namespace Corrade::Utility; -CORRADE_TEST_MAIN(Magnum::Trade::TgaImporter::Test::TgaImporterTest) - namespace Magnum { namespace Trade { namespace TgaImporter { namespace Test { +class TgaImporterTest: public Corrade::TestSuite::Tester { + public: + TgaImporterTest(); + + void openInexistent(); + void openShort(); + void paletted(); + void nonRgb(); + void bits16(); + void bits24(); + void bits32(); +}; + TgaImporterTest::TgaImporterTest() { addTests(&TgaImporterTest::openInexistent, &TgaImporterTest::openShort, @@ -150,3 +159,5 @@ void TgaImporterTest::bits32() { } }}}} + +CORRADE_TEST_MAIN(Magnum::Trade::TgaImporter::Test::TgaImporterTest) diff --git a/src/Plugins/TgaImporter/Test/TgaImporterTest.h b/src/Plugins/TgaImporter/Test/TgaImporterTest.h deleted file mode 100644 index 8835dbbbf..000000000 --- a/src/Plugins/TgaImporter/Test/TgaImporterTest.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef Magnum_Trade_TgaImporter_Test_TgaImporterTest_h -#define Magnum_Trade_TgaImporter_Test_TgaImporterTest_h -/* - Copyright © 2010, 2011, 2012 Vladimír Vondruš - - This file is part of Magnum. - - Magnum is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License version 3 - only, as published by the Free Software Foundation. - - Magnum is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License version 3 for more details. -*/ - -#include - -namespace Magnum { namespace Trade { namespace TgaImporter { namespace Test { - -class TgaImporterTest: public Corrade::TestSuite::Tester { - public: - TgaImporterTest(); - - void openInexistent(); - void openShort(); - void paletted(); - void nonRgb(); - void bits16(); - void bits24(); - void bits32(); -}; - -}}}} - -#endif