From cdb33c8723e2176b446bd4ab0de3c51380ad0b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 15 Jan 2023 17:39:44 +0100 Subject: [PATCH] TgaImageConverter: put test data closer to the actual test case. --- .../Test/TgaImageConverterTest.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp index 69380cc1e..b99098eb7 100644 --- a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp +++ b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp @@ -130,13 +130,6 @@ constexpr char ConvertedDataRGB[] = { const ImageView2D OriginalRGB{PixelStorage{}.setSkip({0, 1, 0}), PixelFormat::RGB8Unorm, {2, 3}, OriginalDataRGB}; -constexpr char OriginalDataRGBA[] = { - 1, 2, 3, 4, 2, 3, 4, 5, - 3, 4, 5, 6, 4, 5, 6, 7, - 5, 6, 7, 8, 6, 7, 8, 9 -}; -const ImageView2D OriginalRGBA{PixelFormat::RGBA8Unorm, {2, 3}, OriginalDataRGBA}; - void TgaImageConverterTest::rgb() { auto&& data = VerboseData[testCaseInstanceId()]; setTestCaseDescription(data.name); @@ -171,6 +164,14 @@ void TgaImageConverterTest::rgb() { CORRADE_COMPARE(out.str(), data.message24); } +/* Padding / skip tested in rgb() */ +constexpr char OriginalDataRGBA[] = { + 1, 2, 3, 4, 2, 3, 4, 5, + 3, 4, 5, 6, 4, 5, 6, 7, + 5, 6, 7, 8, 6, 7, 8, 9 +}; +const ImageView2D OriginalRGBA{PixelFormat::RGBA8Unorm, {2, 3}, OriginalDataRGBA}; + void TgaImageConverterTest::rgba() { auto&& data = VerboseData[testCaseInstanceId()]; setTestCaseDescription(data.name);