From 0581e72fd6babe339f7f8c884228eb7e2661db92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 8 Apr 2021 16:07:16 +0200 Subject: [PATCH] Trade: use the "new" less annoying APIs in a test. --- src/Magnum/Trade/Test/AbstractImageConverterTest.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp index d19264257..4378effe2 100644 --- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp @@ -408,18 +408,17 @@ void AbstractImageConverterTest::exportCompressedToDataCustomDeleter() { CORRADE_COMPARE(out.str(), "Trade::AbstractImageConverter::exportToData(): implementation is not allowed to use a custom Array deleter\n"); } +/* Used by convertImageDataToData() and convertImageDataToFile() */ class ImageDataConverter: public Trade::AbstractImageConverter { private: ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertData|ImageConverterFeature::ConvertCompressedData; } Containers::Array doExportToData(const ImageView2D&) override { - Containers::Array out{Containers::InPlaceInit, {'B'}}; - return out; + return Containers::array({'B'}); }; Containers::Array doExportToData(const CompressedImageView2D&) override { - Containers::Array out{Containers::InPlaceInit, {'C'}}; - return out; + return Containers::array({'C'}); }; }; @@ -430,13 +429,13 @@ void AbstractImageConverterTest::exportImageDataToData() { /* Should get "B" when converting uncompressed */ ImageData2D image{PixelFormat::RGBA8Unorm, {}, nullptr}; CORRADE_COMPARE_AS(converter.exportToData(image), - (Containers::Array{Containers::InPlaceInit, {'B'}}), + Containers::arrayView({'B'}), TestSuite::Compare::Container); } { /* Should get "C" when converting compressed */ ImageData2D image{CompressedPixelFormat::Bc1RGBUnorm, {}, nullptr}; CORRADE_COMPARE_AS(converter.exportToData(image), - (Containers::Array{Containers::InPlaceInit, {'C'}}), + Containers::arrayView({'C'}), TestSuite::Compare::Container); } }