ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

{image,scene}converter: use shorter Array construction in --info tests.

pull/617/head
Vladimír Vondruš 3 years ago
parent
f74e3b5f4e
commit
2d1f71d80b
2 changed files with 49 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      src/Magnum/SceneTools/Test/SceneConverterTest.cpp
  2. 37
      src/Magnum/Trade/Test/ImageConverterTest.cpp

45
src/Magnum/SceneTools/Test/SceneConverterTest.cpp
Unescape View File

@ -62,42 +62,51 @@ const struct {
const char* requiresImageConverter; const char* requiresImageConverter;
const char* expected; const char* expected;
} InfoData[]{ } InfoData[]{
{"importer", Containers::array<Containers::String>({ {"importer", {InPlaceInit, {
"--info-importer", "-i", "someOption=yes"}), "--info-importer", "-i", "someOption=yes"
}},
"AnySceneImporter", nullptr, nullptr, "AnySceneImporter", nullptr, nullptr,
"info-importer.txt"}, "info-importer.txt"},
{"converter", Containers::array<Containers::String>({ {"converter", {InPlaceInit, {
"-C", "AnySceneConverter", "--info-converter", "-c", "someOption=yes"}), "-C", "AnySceneConverter", "--info-converter", "-c", "someOption=yes"
}},
nullptr, "AnySceneConverter", nullptr, nullptr, "AnySceneConverter", nullptr,
"info-converter.txt"}, "info-converter.txt"},
{"converter, implicit", Containers::array<Containers::String>({ {"converter, implicit", {InPlaceInit, {
"--info-converter", "-c", "someOption=yes"}), "--info-converter", "-c", "someOption=yes"
}},
nullptr, "AnySceneConverter", nullptr, nullptr, "AnySceneConverter", nullptr,
"info-converter.txt"}, "info-converter.txt"},
{"image converter", Containers::array<Containers::String>({ {"image converter", {InPlaceInit, {
"-P", "AnyImageConverter", "--info-image-converter", "-p", "someOption=yes"}), "-P", "AnyImageConverter", "--info-image-converter", "-p", "someOption=yes"
}},
nullptr, nullptr, "AnyImageConverter", nullptr, nullptr, "AnyImageConverter",
"info-image-converter.txt"}, "info-image-converter.txt"},
{"image converter, implicit", Containers::array<Containers::String>({ {"image converter, implicit", {InPlaceInit, {
"--info-image-converter", "-p", "someOption=yes"}), "--info-image-converter", "-p", "someOption=yes"
}},
nullptr, nullptr, "AnyImageConverter", nullptr, nullptr, "AnyImageConverter",
"info-image-converter.txt"}, "info-image-converter.txt"},
{"importer, ignored input and output", Containers::array<Containers::String>({ {"importer, ignored input and output", {InPlaceInit, {
"--info-importer", "input.obj", "output.ply"}), "--info-importer", "input.obj", "output.ply"
}},
"AnySceneImporter", nullptr, nullptr, "AnySceneImporter", nullptr, nullptr,
"info-importer-ignored-input-output.txt"}, "info-importer-ignored-input-output.txt"},
{"data", Containers::array<Containers::String>({ {"data", {InPlaceInit, {
"-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj")}), "-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj")
}},
"ObjImporter", nullptr, nullptr, "ObjImporter", nullptr, nullptr,
"info-data.txt"}, "info-data.txt"},
{"data, map", Containers::array<Containers::String>({ {"data, map", {InPlaceInit, {
"--map", "-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj")}), "--map", "-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj")
}},
"ObjImporter", nullptr, nullptr, "ObjImporter", nullptr, nullptr,
/** @todo change to something else once we have a plugin that can /** @todo change to something else once we have a plugin that can
zero-copy pass the imported data */ zero-copy pass the imported data */
"info-data.txt"}, "info-data.txt"},
{"data, ignored output file", Containers::array<Containers::String>({ {"data, ignored output file", {InPlaceInit, {
"-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj"), "whatever.ply"}), "-I", "ObjImporter", "--info", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj"), "whatever.ply"
}},
"ObjImporter", nullptr, nullptr, "ObjImporter", nullptr, nullptr,
"info-data-ignored-output.txt"} "info-data-ignored-output.txt"}
}; };

37
src/Magnum/Trade/Test/ImageConverterTest.cpp
Unescape View File

@ -50,40 +50,47 @@ struct ImageConverterTest: TestSuite::Tester {
using namespace Containers::Literals; using namespace Containers::Literals;
const struct { const struct {
const char* name; TestSuite::TestCaseDescriptionSourceLocation name;
Containers::Array<Containers::String> args; Containers::Array<Containers::String> args;
const char* requiresImporter; const char* requiresImporter;
const char* requiresConverter; const char* requiresConverter;
const char* expected; const char* expected;
} InfoData[]{ } InfoData[]{
{"importer", Containers::array<Containers::String>({ {"importer", {InPlaceInit, {
"--info-importer", "-i", "someOption=yes"}), "--info-importer", "-i", "someOption=yes"
}},
"AnyImageImporter", nullptr, "AnyImageImporter", nullptr,
"info-importer.txt"}, "info-importer.txt"},
{"converter", Containers::array<Containers::String>({ {"converter", {InPlaceInit, {
"-C", "AnyImageConverter", "--info-converter", "-c", "someOption=yes"}), "-C", "AnyImageConverter", "--info-converter", "-c", "someOption=yes"
}},
nullptr, "AnyImageConverter", nullptr, "AnyImageConverter",
"info-converter.txt"}, "info-converter.txt"},
{"converter, implicit", Containers::array<Containers::String>({ {"converter, implicit", {InPlaceInit, {
"--info-converter", "-c", "someOption=yes"}), "--info-converter", "-c", "someOption=yes"
}},
nullptr, "AnyImageConverter", nullptr, "AnyImageConverter",
"info-converter.txt"}, "info-converter.txt"},
{"importer, ignored input and output", Containers::array<Containers::String>({ {"importer, ignored input and output", {InPlaceInit, {
"--info-importer", "a.png", "b.png", "out.jpg"}), "--info-importer", "a.png", "b.png", "out.jpg"
}},
"AnySceneImporter", nullptr, "AnySceneImporter", nullptr,
"info-importer-ignored-input-output.txt"}, "info-importer-ignored-input-output.txt"},
{"data", Containers::array<Containers::String>({ {"data", {InPlaceInit, {
"-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga")}), "-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga")
}},
"TgaImporter", nullptr, "TgaImporter", nullptr,
"info-data.txt"}, "info-data.txt"},
{"data, map", Containers::array<Containers::String>({ {"data, map", {InPlaceInit, {
"--map", "-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga")}), "--map", "-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga")
}},
"TgaImporter", nullptr, "TgaImporter", nullptr,
/** @todo change to something else once we have a plugin that can /** @todo change to something else once we have a plugin that can
zero-copy pass the imported data */ zero-copy pass the imported data */
"info-data.txt"}, "info-data.txt"},
{"data, ignored output file", Containers::array<Containers::String>({ {"data, ignored output file", {InPlaceInit, {
"-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga"), "whatever.png"}), "-I", "TgaImporter", "--info", Utility::Path::join(TRADE_TEST_DIR, "ImageConverterTestFiles/file.tga"), "whatever.png"
}},
"TgaImporter", nullptr, "TgaImporter", nullptr,
"info-data-ignored-output.txt"} "info-data-ignored-output.txt"}
}; };

Write Preview
Loading…
Cancel
Save