From b38b05cae156fab5f6f7bb8a474f12c48d553283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 18 Jan 2023 21:06:17 +0100 Subject: [PATCH] sceneconverter: verify also the unimplemented case for 1D images. --- src/Magnum/SceneTools/Test/CMakeLists.txt | 1 + src/Magnum/SceneTools/Test/SceneConverterTest.cpp | 10 ++++++++++ .../Test/SceneConverterTestFiles/1d.ktx2 | Bin 0 -> 264 bytes 3 files changed, 11 insertions(+) create mode 100644 src/Magnum/SceneTools/Test/SceneConverterTestFiles/1d.ktx2 diff --git a/src/Magnum/SceneTools/Test/CMakeLists.txt b/src/Magnum/SceneTools/Test/CMakeLists.txt index 9bbcf6441..4239f0fed 100644 --- a/src/Magnum/SceneTools/Test/CMakeLists.txt +++ b/src/Magnum/SceneTools/Test/CMakeLists.txt @@ -91,6 +91,7 @@ if(CORRADE_TARGET_UNIX AND NOT CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT) # executable so plugin existence checks are consistent between the two ${MAGNUM_SCENECONVERTER_STATIC_PLUGINS} FILES + SceneConverterTestFiles/1d.ktx2 SceneConverterTestFiles/blue4x4.png # magnum-imageconverter --layers blue4x4.png --array blue4x4x1.ktx2 -c writerName= SceneConverterTestFiles/blue4x4x1.ktx2 diff --git a/src/Magnum/SceneTools/Test/SceneConverterTest.cpp b/src/Magnum/SceneTools/Test/SceneConverterTest.cpp index ea68f4c4f..0c06d686f 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTest.cpp +++ b/src/Magnum/SceneTools/Test/SceneConverterTest.cpp @@ -968,6 +968,16 @@ const struct { "\n" /* Just a suffix */ "Trade::GltfSceneConverter::add(): can't load NonexistentImageConverter for image conversion\n" "Cannot add 3D image 0\n"}, + {"1D image processing not implemented", {InPlaceInit, { + /* Faking an image-only importer which is fine, it's failing right + after anyway; also not supplying any size to the resize plugin */ + "-I" "KtxImporter", "-P" "StbResizeImageConverter", + Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/1d.ktx2"), + Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/whatever.gltf") + }}, + nullptr, "KtxImporter", nullptr, + nullptr, + "Sorry, 1D image conversion is not implemented yet\n"}, }; SceneConverterTest::SceneConverterTest() { diff --git a/src/Magnum/SceneTools/Test/SceneConverterTestFiles/1d.ktx2 b/src/Magnum/SceneTools/Test/SceneConverterTestFiles/1d.ktx2 new file mode 100644 index 0000000000000000000000000000000000000000..9a50d8e8a5196c79211a0142a9616d521e4bb538 GIT binary patch literal 264 zcmZ4O9TK5nWU!l;ONvXDfq{V$h*^Lb8Gyt<7z8qa*awKW0I>%Uqk}(C0Uk6Oqz43; zfVvnNnZRsjFbN{q;jI5a76$`6%sK`TUx0xfq5;ST@dbex=Eyu2v0B(;d4BtN^PLZQq=&p^+h&P+jHAty5lNyHRv*8l$?0~zY;0rPhvRsaA1 literal 0 HcmV?d00001