From badc94c12294149408555b1f665b41c551ae2111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 16 Mar 2023 11:20:41 +0100 Subject: [PATCH] python: resolve a test TODO now that we have plugin metadata access. --- package/ci/appveyor-desktop-gles.bat | 1 + package/ci/appveyor-desktop.bat | 1 + package/ci/unix-desktop-gles.sh | 1 + package/ci/unix-desktop.sh | 1 + src/python/magnum/test/test_trade.py | 11 +++++++++-- 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index 45d460f..d53486a 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -63,6 +63,7 @@ cmake .. ^ -DMAGNUM_WITH_WINDOWLESSWGLAPPLICATION=ON ^ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON ^ -DMAGNUM_WITH_ANYSCENECONVERTER=ON ^ + -DMAGNUM_WITH_TGAIMPORTER=ON ^ -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index 68ab338..c53294e 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -73,6 +73,7 @@ cmake .. ^ -DMAGNUM_WITH_WINDOWLESSWGLAPPLICATION=ON ^ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON ^ -DMAGNUM_WITH_ANYSCENECONVERTER=ON ^ + -DMAGNUM_WITH_TGAIMPORTER=ON ^ %COMPILER_EXTRA% -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/unix-desktop-gles.sh b/package/ci/unix-desktop-gles.sh index cd78f2f..953b058 100755 --- a/package/ci/unix-desktop-gles.sh +++ b/package/ci/unix-desktop-gles.sh @@ -46,6 +46,7 @@ cmake .. \ -DMAGNUM_WITH_WINDOWLESSEGLAPPLICATION=ON \ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON \ -DMAGNUM_WITH_ANYSCENECONVERTER=ON \ + -DMAGNUM_WITH_TGAIMPORTER=ON \ -G Ninja ninja install cd ../.. diff --git a/package/ci/unix-desktop.sh b/package/ci/unix-desktop.sh index f408b45..def8a23 100755 --- a/package/ci/unix-desktop.sh +++ b/package/ci/unix-desktop.sh @@ -47,6 +47,7 @@ cmake .. \ -DMAGNUM_WITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=ON \ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON \ -DMAGNUM_WITH_ANYSCENECONVERTER=ON \ + -DMAGNUM_WITH_TGAIMPORTER=ON \ -G Ninja # In case of a static build there's no way for the test to know the plugin diff --git a/src/python/magnum/test/test_trade.py b/src/python/magnum/test/test_trade.py index e69a717..c994d4e 100644 --- a/src/python/magnum/test/test_trade.py +++ b/src/python/magnum/test/test_trade.py @@ -1005,9 +1005,16 @@ class Importer(unittest.TestCase): def test_set_preferred_plugins(self): manager = trade.ImporterManager() - # TODO test this better once we can verify it gets actually loaded + + # TGA importer is loaded directly + importer = manager.load_and_instantiate('TgaImporter') + self.assertEqual(importer.metadata.name, 'TgaImporter') + manager.set_preferred_plugins('TgaImporter', ['StbImageImporter', 'DevIlImageImporter']) - self.assertIn('StbImageImporter', manager.alias_list) + + # TGA importer is loaded from the preferred implementation + importer = manager.load_and_instantiate('TgaImporter') + self.assertEqual(importer.metadata.name, 'StbImageImporter') def test_set_preferred_plugins_alias_not_found(self): manager = trade.ImporterManager()