diff --git a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp index 20e7d01ba..4cdb86e43 100644 --- a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp +++ b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include "Magnum/ColorFormat.h" @@ -144,8 +145,8 @@ void TgaImporterTest::colorBits24() { CORRADE_COMPARE(image->format(), ColorFormat::RGB); CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->type(), ColorType::UnsignedByte); - CORRADE_COMPARE((std::string{image->data(), 2*3*3}), - (std::string{pixels, 2*3*3})); + CORRADE_COMPARE_AS(image->data(), Containers::ArrayView{pixels}, + TestSuite::Compare::Container); } void TgaImporterTest::colorBits32() { @@ -168,8 +169,8 @@ void TgaImporterTest::colorBits32() { CORRADE_COMPARE(image->format(), ColorFormat::RGBA); CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->type(), ColorType::UnsignedByte); - CORRADE_COMPARE((std::string{image->data(), 2*3*3}), - (std::string{pixels, 2*3*3})); + CORRADE_COMPARE_AS(image->data(), Containers::ArrayView{pixels}, + TestSuite::Compare::Container); } void TgaImporterTest::grayscaleBits8() { @@ -191,8 +192,8 @@ void TgaImporterTest::grayscaleBits8() { #endif CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->type(), ColorType::UnsignedByte); - CORRADE_COMPARE((std::string{image->data(), 2*3}), - (std::string{data + 18, 2*3})); + CORRADE_COMPARE_AS(image->data(), Containers::ArrayView{data}.suffix(18), + TestSuite::Compare::Container); } void TgaImporterTest::grayscaleBits16() { @@ -225,8 +226,8 @@ void TgaImporterTest::file() { #endif CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->type(), ColorType::UnsignedByte); - CORRADE_COMPARE((std::string{image->data(), 2*3}), - (std::string{data + 18, 2*3})); + CORRADE_COMPARE_AS(image->data(), Containers::ArrayView{data}.suffix(18), + TestSuite::Compare::Container); } }}}