From 22d14848146778456b660086004143098d970e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 22 Jun 2021 16:22:15 +0200 Subject: [PATCH] Test: rename Any* plugin test cases for clarity. --- .../AnyImageConverter/Test/AnyImageConverterTest.cpp | 6 +++--- .../AnyImageImporter/Test/AnyImageImporterTest.cpp | 6 +++--- .../AnySceneConverter/Test/AnySceneConverterTest.cpp | 12 ++++++------ .../AnySceneImporter/Test/AnySceneImporterTest.cpp | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp b/src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp index 6bf445a5c..c449fec11 100644 --- a/src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp +++ b/src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp @@ -48,7 +48,7 @@ struct AnyImageConverterTest: TestSuite::Tester { void unknown(); - void verbose(); + void propagateFlags(); /* Explicitly forbid system-wide plugin dependencies */ PluginManager::Manager _manager{"nonexistent"}; @@ -84,7 +84,7 @@ AnyImageConverterTest::AnyImageConverterTest() { addTests({&AnyImageConverterTest::unknown, - &AnyImageConverterTest::verbose}); + &AnyImageConverterTest::propagateFlags}); /* Load the plugin directly from the build tree. Otherwise it's static and already loaded. */ @@ -155,7 +155,7 @@ void AnyImageConverterTest::unknown() { CORRADE_COMPARE(output.str(), "Trade::AnyImageConverter::convertToFile(): cannot determine the format of image.xcf\n"); } -void AnyImageConverterTest::verbose() { +void AnyImageConverterTest::propagateFlags() { if(!(_manager.loadState("TgaImageConverter") & PluginManager::LoadState::Loaded)) CORRADE_SKIP("TgaImageConverter plugin not enabled, cannot test"); diff --git a/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp b/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp index d1ad081fc..8179fdde4 100644 --- a/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp +++ b/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp @@ -49,7 +49,7 @@ struct AnyImageImporterTest: TestSuite::Tester { void unknownSignature(); void emptyData(); - void verbose(); + void propagateFlags(); /* Explicitly forbid system-wide plugin dependencies */ PluginManager::Manager _manager{"nonexistent"}; @@ -130,7 +130,7 @@ AnyImageImporterTest::AnyImageImporterTest() { addTests({&AnyImageImporterTest::emptyData}); - addInstancedTests({&AnyImageImporterTest::verbose}, + addInstancedTests({&AnyImageImporterTest::propagateFlags}, Containers::arraySize(LoadData)); /* Load the plugin directly from the build tree. Otherwise it's static and @@ -222,7 +222,7 @@ void AnyImageImporterTest::emptyData() { CORRADE_COMPARE(output.str(), "Trade::AnyImageImporter::openData(): file is empty\n"); } -void AnyImageImporterTest::verbose() { +void AnyImageImporterTest::propagateFlags() { auto&& data = LoadData[testCaseInstanceId()]; setTestCaseDescription(data.name); diff --git a/src/MagnumPlugins/AnySceneConverter/Test/AnySceneConverterTest.cpp b/src/MagnumPlugins/AnySceneConverter/Test/AnySceneConverterTest.cpp index e545d5dbf..5653a5be7 100644 --- a/src/MagnumPlugins/AnySceneConverter/Test/AnySceneConverterTest.cpp +++ b/src/MagnumPlugins/AnySceneConverter/Test/AnySceneConverterTest.cpp @@ -41,12 +41,12 @@ namespace Magnum { namespace Trade { namespace Test { namespace { struct AnySceneConverterTest: TestSuite::Tester { explicit AnySceneConverterTest(); - void load(); + void convert(); void detect(); void unknown(); - void verbose(); + void propagateFlags(); /* Explicitly forbid system-wide plugin dependencies */ PluginManager::Manager _manager{"nonexistent"}; @@ -62,14 +62,14 @@ constexpr struct { }; AnySceneConverterTest::AnySceneConverterTest() { - addTests({&AnySceneConverterTest::load}); + addTests({&AnySceneConverterTest::convert}); addInstancedTests({&AnySceneConverterTest::detect}, Containers::arraySize(DetectData)); addTests({&AnySceneConverterTest::unknown, - &AnySceneConverterTest::verbose}); + &AnySceneConverterTest::propagateFlags}); /* Load the plugin directly from the build tree. Otherwise it's static and already loaded. */ @@ -81,7 +81,7 @@ AnySceneConverterTest::AnySceneConverterTest() { CORRADE_INTERNAL_ASSERT_OUTPUT(Utility::Directory::mkpath(ANYSCENECONVERTER_TEST_OUTPUT_DIR)); } -void AnySceneConverterTest::load() { +void AnySceneConverterTest::convert() { CORRADE_SKIP("No scene converter plugin available to test."); } @@ -114,7 +114,7 @@ void AnySceneConverterTest::unknown() { CORRADE_COMPARE(output.str(), "Trade::AnySceneConverter::convertToFile(): cannot determine the format of mesh.obj\n"); } -void AnySceneConverterTest::verbose() { +void AnySceneConverterTest::propagateFlags() { CORRADE_SKIP("No plugin available to test."); } diff --git a/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp b/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp index 9f5f88610..0aef4c5c9 100644 --- a/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp +++ b/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp @@ -56,7 +56,7 @@ struct AnySceneImporterTest: TestSuite::Tester { void unknown(); - void verbose(); + void propagateFlags(); /* Explicitly forbid system-wide plugin dependencies */ PluginManager::Manager _manager{"nonexistent"}; @@ -98,7 +98,7 @@ AnySceneImporterTest::AnySceneImporterTest() { addTests({&AnySceneImporterTest::unknown, - &AnySceneImporterTest::verbose}); + &AnySceneImporterTest::propagateFlags}); /* Load the plugin directly from the build tree. Otherwise it's static and already loaded. */ @@ -181,7 +181,7 @@ void AnySceneImporterTest::unknown() { CORRADE_COMPARE(output.str(), "Trade::AnySceneImporter::openFile(): cannot determine the format of mesh.wtf\n"); } -void AnySceneImporterTest::verbose() { +void AnySceneImporterTest::propagateFlags() { if(!(_manager.loadState("ObjImporter") & PluginManager::LoadState::Loaded)) CORRADE_SKIP("ObjImporter plugin not enabled, cannot test");