From 590717acfe120df113bc2459549d98ddc693607b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 19 Feb 2017 23:51:45 +0100 Subject: [PATCH] Trade: fix copypaste error in the test. And then an assertion. Huh. Did I ever look at the code coverage?! --- src/Magnum/Trade/Test/AbstractImageConverterTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp index 07abc113e..ee6a4a01d 100644 --- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp @@ -84,7 +84,7 @@ namespace { class ImageDataExporter: public Trade::AbstractImageConverter { private: - Features doFeatures() const override { return Feature::ConvertData; } + Features doFeatures() const override { return Feature::ConvertData|Feature::ConvertCompressedData; } Containers::Array doExportToData(const ImageView2D&) override { return Containers::Array{Containers::InPlaceInit, {'B'}}; @@ -108,7 +108,7 @@ void AbstractImageConverterTest::exportToDataImageData() { TestSuite::Compare::Container); } { /* Should get "C" when converting compressed */ - ImageData2D image{PixelFormat::RGBA, PixelType::UnsignedByte, {}, nullptr}; + ImageData2D image{CompressedPixelFormat::RGBAS3tcDxt1, {}, nullptr}; CORRADE_COMPARE_AS(exporter.exportToData(image), (Containers::Array{Containers::InPlaceInit, {'C'}}), TestSuite::Compare::Container); @@ -125,11 +125,11 @@ void AbstractImageConverterTest::exportToFileImageData() { CORRADE_COMPARE_AS(Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"), "B", TestSuite::Compare::FileToString); } { - /* Should get "B" when converting uncompressed */ - ImageData2D image{PixelFormat::RGBA, PixelType::UnsignedByte, {}, nullptr}; + /* Should get "C" when converting compressed */ + ImageData2D image{CompressedPixelFormat::RGBAS3tcDxt1, {}, nullptr}; CORRADE_VERIFY(exporter.exportToFile(image, Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"))); CORRADE_COMPARE_AS(Utility::Directory::join(TRADE_TEST_OUTPUT_DIR, "image.out"), - "B", TestSuite::Compare::FileToString); + "C", TestSuite::Compare::FileToString); } }