Browse Source

Trade: use the "new" less annoying APIs in a test.

pull/504/head
Vladimír Vondruš 5 years ago
parent
commit
0581e72fd6
  1. 11
      src/Magnum/Trade/Test/AbstractImageConverterTest.cpp

11
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"); 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 { class ImageDataConverter: public Trade::AbstractImageConverter {
private: private:
ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertData|ImageConverterFeature::ConvertCompressedData; } ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertData|ImageConverterFeature::ConvertCompressedData; }
Containers::Array<char> doExportToData(const ImageView2D&) override { Containers::Array<char> doExportToData(const ImageView2D&) override {
Containers::Array<char> out{Containers::InPlaceInit, {'B'}}; return Containers::array({'B'});
return out;
}; };
Containers::Array<char> doExportToData(const CompressedImageView2D&) override { Containers::Array<char> doExportToData(const CompressedImageView2D&) override {
Containers::Array<char> out{Containers::InPlaceInit, {'C'}}; return Containers::array({'C'});
return out;
}; };
}; };
@ -430,13 +429,13 @@ void AbstractImageConverterTest::exportImageDataToData() {
/* Should get "B" when converting uncompressed */ /* Should get "B" when converting uncompressed */
ImageData2D image{PixelFormat::RGBA8Unorm, {}, nullptr}; ImageData2D image{PixelFormat::RGBA8Unorm, {}, nullptr};
CORRADE_COMPARE_AS(converter.exportToData(image), CORRADE_COMPARE_AS(converter.exportToData(image),
(Containers::Array<char>{Containers::InPlaceInit, {'B'}}), Containers::arrayView({'B'}),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} { } {
/* Should get "C" when converting compressed */ /* Should get "C" when converting compressed */
ImageData2D image{CompressedPixelFormat::Bc1RGBUnorm, {}, nullptr}; ImageData2D image{CompressedPixelFormat::Bc1RGBUnorm, {}, nullptr};
CORRADE_COMPARE_AS(converter.exportToData(image), CORRADE_COMPARE_AS(converter.exportToData(image),
(Containers::Array<char>{Containers::InPlaceInit, {'C'}}), Containers::arrayView({'C'}),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
} }

Loading…
Cancel
Save