From 52c918bcb40f0ac7a00af247b964d1d8a085a582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 15 Jan 2023 21:46:39 +0100 Subject: [PATCH] TgaImageConverter: test the verbose message before a SKIP(). So it's still verified even if TgaImporter isn't built. --- .../TgaImageConverter/Test/TgaImageConverterTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp index 180fd8a1e..798fa71c7 100644 --- a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp +++ b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp @@ -333,6 +333,7 @@ void TgaImageConverterTest::uncompressedRgb() { array = converter->convertToData(OriginalRGB); } CORRADE_VERIFY(array); + CORRADE_COMPARE(out.str(), data.message24); if(!(_importerManager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) CORRADE_SKIP("TgaImporter plugin not enabled, can't test the result"); @@ -347,7 +348,6 @@ void TgaImageConverterTest::uncompressedRgb() { CORRADE_COMPARE(converted->format(), PixelFormat::RGB8Unorm); CORRADE_COMPARE_AS(converted->data(), Containers::arrayView(ConvertedDataRGB), TestSuite::Compare::Container); - CORRADE_COMPARE(out.str(), data.message24); } /* Padding / skip tested in uncompressedRgb() */ @@ -375,6 +375,7 @@ void TgaImageConverterTest::uncompressedRgba() { array = converter->convertToData(OriginalRGBA); } CORRADE_VERIFY(array); + CORRADE_COMPARE(out.str(), data.message32); if(!(_importerManager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) CORRADE_SKIP("TgaImporter plugin not enabled, can't test the result"); @@ -389,7 +390,6 @@ void TgaImageConverterTest::uncompressedRgba() { CORRADE_COMPARE(converted->format(), PixelFormat::RGBA8Unorm); CORRADE_COMPARE_AS(converted->data(), Containers::arrayView(OriginalDataRGBA), TestSuite::Compare::Container); - CORRADE_COMPARE(out.str(), data.message32); } /* Padding / skip tested in uncompressedRgb() */