From b6e5a27c92bde5602c96378eab2c9ee1a3ad544b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 23 Jul 2015 20:29:19 +0200 Subject: [PATCH] Split format debug output tests to separate file. Makes more sense when tests for texture, renderbuffer etc formats are added. --- src/Magnum/Test/AbstractImageTest.cpp | 21 +-------- src/Magnum/Test/CMakeLists.txt | 1 + src/Magnum/Test/FormatTest.cpp | 61 +++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 20 deletions(-) create mode 100644 src/Magnum/Test/FormatTest.cpp diff --git a/src/Magnum/Test/AbstractImageTest.cpp b/src/Magnum/Test/AbstractImageTest.cpp index 39c0a0300..b2ff35bff 100644 --- a/src/Magnum/Test/AbstractImageTest.cpp +++ b/src/Magnum/Test/AbstractImageTest.cpp @@ -23,7 +23,6 @@ DEALINGS IN THE SOFTWARE. */ -#include #include #include "Magnum/AbstractImage.h" @@ -37,17 +36,11 @@ struct AbstractImageTest: TestSuite::Tester { void pixelSize(); void dataSize(); - - void debugFormat(); - void debugType(); }; AbstractImageTest::AbstractImageTest() { addTests({&AbstractImageTest::pixelSize, - &AbstractImageTest::dataSize, - - &AbstractImageTest::debugFormat, - &AbstractImageTest::debugType}); + &AbstractImageTest::dataSize}); } void AbstractImageTest::pixelSize() { @@ -68,18 +61,6 @@ void AbstractImageTest::dataSize() { 4*2*16*8); } -void AbstractImageTest::debugFormat() { - std::ostringstream o; - Debug(&o) << ColorFormat::RGBA; - CORRADE_COMPARE(o.str(), "ColorFormat::RGBA\n"); -} - -void AbstractImageTest::debugType() { - std::ostringstream o; - Debug(&o) << ColorType::UnsignedShort5551; - CORRADE_COMPARE(o.str(), "ColorType::UnsignedShort5551\n"); -} - }} CORRADE_TEST_MAIN(Magnum::Test::AbstractImageTest) diff --git a/src/Magnum/Test/CMakeLists.txt b/src/Magnum/Test/CMakeLists.txt index f106fce0a..9492f8039 100644 --- a/src/Magnum/Test/CMakeLists.txt +++ b/src/Magnum/Test/CMakeLists.txt @@ -27,6 +27,7 @@ corrade_add_test(AbstractImageTest AbstractImageTest.cpp LIBRARIES Magnum) corrade_add_test(AbstractShaderProgramTest AbstractShaderProgramTest.cpp LIBRARIES Magnum) corrade_add_test(ArrayTest ArrayTest.cpp) corrade_add_test(ColorTest ColorTest.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(FormatTest FormatTest.cpp LIBRARIES Magnum) corrade_add_test(ContextTest ContextTest.cpp LIBRARIES Magnum) corrade_add_test(DebugOutputTest DebugOutputTest.cpp LIBRARIES Magnum) corrade_add_test(DefaultFramebufferTest DefaultFramebufferTest.cpp LIBRARIES Magnum) diff --git a/src/Magnum/Test/FormatTest.cpp b/src/Magnum/Test/FormatTest.cpp new file mode 100644 index 000000000..cb7875590 --- /dev/null +++ b/src/Magnum/Test/FormatTest.cpp @@ -0,0 +1,61 @@ +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013, 2014, 2015 + Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#include +#include + +#include "Magnum/ColorFormat.h" + +namespace Magnum { namespace Test { + +struct FormatTest: TestSuite::Tester { + explicit FormatTest(); + + void debugColorFormat(); + void debugColorType(); +}; + +FormatTest::FormatTest() { + addTests({&FormatTest::debugColorFormat, + &FormatTest::debugColorType}); +} + +void FormatTest::debugColorFormat() { + std::ostringstream out; + + Debug(&out) << ColorFormat::RGBA; + CORRADE_COMPARE(out.str(), "ColorFormat::RGBA\n"); +} + +void FormatTest::debugColorType() { + std::ostringstream out; + + Debug(&out) << ColorType::UnsignedByte; + CORRADE_COMPARE(out.str(), "ColorType::UnsignedByte\n"); +} + +}} + +CORRADE_TEST_MAIN(Magnum::Test::FormatTest)