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

Make plugin existence checks in tests consistent.

pull/539/head
Vladimír Vondruš 4 years ago
parent
ae7524dcbb
commit
ce63928efc
2 changed files with 51 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 96
      src/Magnum/DebugTools/Test/CompareImageTest.cpp
  2. 5
      src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp

96
src/Magnum/DebugTools/Test/CompareImageTest.cpp
Unescape View File

@ -1046,9 +1046,9 @@ void CompareImageTest::imageError() {
}
void CompareImageTest::imageFileZeroDelta() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
CORRADE_COMPARE_WITH(
Utility::Directory::join(DEBUGTOOLS_TEST_DIR, "CompareImageExpected.tga"),
@ -1064,9 +1064,9 @@ void CompareImageTest::imageFileZeroDelta() {
}
void CompareImageTest::imageFileNonZeroDelta() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
/* This will produce output if --verbose is specified */
CORRADE_COMPARE_WITH(
@ -1091,9 +1091,9 @@ void CompareImageTest::imageFileNonZeroDelta() {
}
void CompareImageTest::imageFileError() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
std::stringstream out;
@ -1156,9 +1156,9 @@ void CompareImageTest::imageFilePluginLoadFailed() {
}
void CompareImageTest::imageFileActualLoadFailed() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
std::stringstream out;
@ -1177,9 +1177,9 @@ void CompareImageTest::imageFileActualLoadFailed() {
}
void CompareImageTest::imageFileExpectedLoadFailed() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
std::stringstream out;
@ -1276,9 +1276,9 @@ void CompareImageTest::imageFileExpectedIsCompressed() {
}
void CompareImageTest::imageToFileZeroDelta() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
CORRADE_COMPARE_WITH(ExpectedRgb,
Utility::Directory::join(DEBUGTOOLS_TEST_DIR, "CompareImageExpected.tga"),
@ -1291,9 +1291,9 @@ void CompareImageTest::imageToFileZeroDelta() {
}
void CompareImageTest::imageToFileNonZeroDelta() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
/* This will produce output if --verbose is specified */
CORRADE_COMPARE_WITH(ActualRgb,
@ -1315,9 +1315,9 @@ void CompareImageTest::imageToFileNonZeroDelta() {
}
void CompareImageTest::imageToFileError() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
std::stringstream out;
@ -1378,9 +1378,9 @@ void CompareImageTest::imageToFilePluginLoadFailed() {
}
void CompareImageTest::imageToFileExpectedLoadFailed() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
std::stringstream out;
@ -1454,9 +1454,9 @@ void CompareImageTest::imageToFileExpectedIsCompressed() {
}
void CompareImageTest::fileToImageZeroDelta() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
CORRADE_COMPARE_WITH(
Utility::Directory::join(DEBUGTOOLS_TEST_DIR, "CompareImageExpected.tga"),
@ -1470,9 +1470,9 @@ void CompareImageTest::fileToImageZeroDelta() {
}
void CompareImageTest::fileToImageNonZeroDelta() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
/* This will produce output if --verbose is specified */
CORRADE_COMPARE_WITH(
@ -1496,9 +1496,9 @@ void CompareImageTest::fileToImageNonZeroDelta() {
}
void CompareImageTest::fileToImageError() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
std::stringstream out;
@ -1538,9 +1538,9 @@ void CompareImageTest::fileToImagePluginLoadFailed() {
}
void CompareImageTest::fileToImageActualLoadFailed() {
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
std::stringstream out;
@ -1629,9 +1629,9 @@ void CompareImageTest::pixelsToImageError() {
void CompareImageTest::pixelsToFileZeroDelta() {
/* Same as imageToFile(), but taking pixels instead */
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
CORRADE_COMPARE_WITH(ExpectedRgb.pixels<Color3ub>(),
Utility::Directory::join(DEBUGTOOLS_TEST_DIR, "CompareImageExpected.tga"),
@ -1646,9 +1646,9 @@ void CompareImageTest::pixelsToFileZeroDelta() {
void CompareImageTest::pixelsToFileNonZeroDelta() {
/* Same as imageToFile(), but taking pixels instead */
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
CORRADE_COMPARE_WITH(ActualRgb.pixels<Color3ub>(),
Utility::Directory::join(DEBUGTOOLS_TEST_DIR, "CompareImageExpected.tga"),
@ -1671,9 +1671,9 @@ void CompareImageTest::pixelsToFileNonZeroDelta() {
void CompareImageTest::pixelsToFileError() {
/* Same as imageToFileError(), but taking pixels instead */
if(_importerManager->loadState("AnyImageImporter") == PluginManager::LoadState::NotFound ||
_importerManager->loadState("TgaImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter or TgaImporter plugins not found.");
if(!(_importerManager->loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_importerManager->loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
std::stringstream out;

5
src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp
Unescape View File

@ -178,8 +178,9 @@ void DistanceFieldGLTest::test() {
MAGNUM_VERIFY_NO_GL_ERROR();
if(_manager.loadState("AnyImageImporter") == PluginManager::LoadState::NotFound)
CORRADE_SKIP("AnyImageImporter plugin not found.");
if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
!(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found.");
/** @todo Do this via some TextureTools::pixelFormatTransform() */
if(actualOutputImage->format() == PixelFormat::RGBA8Unorm) {

Write Preview
Loading…
Cancel
Save