diff --git a/src/Magnum/SceneTools/Test/SceneConverterTest.cpp b/src/Magnum/SceneTools/Test/SceneConverterTest.cpp index 981776d30..a587d16cd 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTest.cpp +++ b/src/Magnum/SceneTools/Test/SceneConverterTest.cpp @@ -62,42 +62,51 @@ const struct { const char* requiresImageConverter; const char* expected; } InfoData[]{ - {"importer", Containers::array({ - "--info-importer", "-i", "someOption=yes"}), + {"importer", {InPlaceInit, { + "--info-importer", "-i", "someOption=yes" + }}, "AnySceneImporter", nullptr, nullptr, "info-importer.txt"}, - {"converter", Containers::array({ - "-C", "AnySceneConverter", "--info-converter", "-c", "someOption=yes"}), + {"converter", {InPlaceInit, { + "-C", "AnySceneConverter", "--info-converter", "-c", "someOption=yes" + }}, nullptr, "AnySceneConverter", nullptr, "info-converter.txt"}, - {"converter, implicit", Containers::array({ - "--info-converter", "-c", "someOption=yes"}), + {"converter, implicit", {InPlaceInit, { + "--info-converter", "-c", "someOption=yes" + }}, nullptr, "AnySceneConverter", nullptr, "info-converter.txt"}, - {"image converter", Containers::array({ - "-P", "AnyImageConverter", "--info-image-converter", "-p", "someOption=yes"}), + {"image converter", {InPlaceInit, { + "-P", "AnyImageConverter", "--info-image-converter", "-p", "someOption=yes" + }}, nullptr, nullptr, "AnyImageConverter", "info-image-converter.txt"}, - {"image converter, implicit", Containers::array({ - "--info-image-converter", "-p", "someOption=yes"}), + {"image converter, implicit", {InPlaceInit, { + "--info-image-converter", "-p", "someOption=yes" + }}, nullptr, nullptr, "AnyImageConverter", "info-image-converter.txt"}, - {"importer, ignored input and output", Containers::array({ - "--info-importer", "input.obj", "output.ply"}), + {"importer, ignored input and output", {InPlaceInit, { + "--info-importer", "input.obj", "output.ply" + }}, "AnySceneImporter", nullptr, nullptr, "info-importer-ignored-input-output.txt"}, - {"data", Containers::array({ - "-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj")}), + {"data", {InPlaceInit, { + "-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj") + }}, "ObjImporter", nullptr, nullptr, "info-data.txt"}, - {"data, map", Containers::array({ - "--map", "-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj")}), + {"data, map", {InPlaceInit, { + "--map", "-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj") + }}, "ObjImporter", nullptr, nullptr, /** @todo change to something else once we have a plugin that can zero-copy pass the imported data */ "info-data.txt"}, - {"data, ignored output file", Containers::array({ - "-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj"), "whatever.ply"}), + {"data, ignored output file", {InPlaceInit, { + "-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj"), "whatever.ply" + }}, "ObjImporter", nullptr, nullptr, "info-data-ignored-output.txt"} }; diff --git a/src/Magnum/Trade/Test/ImageConverterTest.cpp b/src/Magnum/Trade/Test/ImageConverterTest.cpp index 715ca7016..7b031b1e6 100644 --- a/src/Magnum/Trade/Test/ImageConverterTest.cpp +++ b/src/Magnum/Trade/Test/ImageConverterTest.cpp @@ -50,40 +50,47 @@ struct ImageConverterTest: TestSuite::Tester { using namespace Containers::Literals; const struct { - const char* name; + TestSuite::TestCaseDescriptionSourceLocation name; Containers::Array args; const char* requiresImporter; const char* requiresConverter; const char* expected; } InfoData[]{ - {"importer", Containers::array({ - "--info-importer", "-i", "someOption=yes"}), + {"importer", {InPlaceInit, { + "--info-importer", "-i", "someOption=yes" + }}, "AnyImageImporter", nullptr, "info-importer.txt"}, - {"converter", Containers::array({ - "-C", "AnyImageConverter", "--info-converter", "-c", "someOption=yes"}), + {"converter", {InPlaceInit, { + "-C", "AnyImageConverter", "--info-converter", "-c", "someOption=yes" + }}, nullptr, "AnyImageConverter", "info-converter.txt"}, - {"converter, implicit", Containers::array({ - "--info-converter", "-c", "someOption=yes"}), + {"converter, implicit", {InPlaceInit, { + "--info-converter", "-c", "someOption=yes" + }}, nullptr, "AnyImageConverter", "info-converter.txt"}, - {"importer, ignored input and output", Containers::array({ - "--info-importer", "a.png", "b.png", "out.jpg"}), + {"importer, ignored input and output", {InPlaceInit, { + "--info-importer", "a.png", "b.png", "out.jpg" + }}, "AnySceneImporter", nullptr, "info-importer-ignored-input-output.txt"}, - {"data", Containers::array({ - "-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga")}), + {"data", {InPlaceInit, { + "-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga") + }}, "TgaImporter", nullptr, "info-data.txt"}, - {"data, map", Containers::array({ - "--map", "-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga")}), + {"data, map", {InPlaceInit, { + "--map", "-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga") + }}, "TgaImporter", nullptr, /** @todo change to something else once we have a plugin that can zero-copy pass the imported data */ "info-data.txt"}, - {"data, ignored output file", Containers::array({ - "-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga"), "whatever.png"}), + {"data, ignored output file", {InPlaceInit, { + "-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga"), "whatever.png" + }}, "TgaImporter", nullptr, "info-data-ignored-output.txt"} };