Browse Source

python: resolve a test TODO now that we have plugin metadata access.

next
Vladimír Vondruš 3 years ago
parent
commit
badc94c122
  1. 1
      package/ci/appveyor-desktop-gles.bat
  2. 1
      package/ci/appveyor-desktop.bat
  3. 1
      package/ci/unix-desktop-gles.sh
  4. 1
      package/ci/unix-desktop.sh
  5. 11
      src/python/magnum/test/test_trade.py

1
package/ci/appveyor-desktop-gles.bat

@ -63,6 +63,7 @@ cmake .. ^
-DMAGNUM_WITH_WINDOWLESSWGLAPPLICATION=ON ^ -DMAGNUM_WITH_WINDOWLESSWGLAPPLICATION=ON ^
-DMAGNUM_WITH_ANYIMAGEIMPORTER=ON ^ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON ^
-DMAGNUM_WITH_ANYSCENECONVERTER=ON ^ -DMAGNUM_WITH_ANYSCENECONVERTER=ON ^
-DMAGNUM_WITH_TGAIMPORTER=ON ^
-G Ninja || exit /b -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b

1
package/ci/appveyor-desktop.bat

@ -73,6 +73,7 @@ cmake .. ^
-DMAGNUM_WITH_WINDOWLESSWGLAPPLICATION=ON ^ -DMAGNUM_WITH_WINDOWLESSWGLAPPLICATION=ON ^
-DMAGNUM_WITH_ANYIMAGEIMPORTER=ON ^ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON ^
-DMAGNUM_WITH_ANYSCENECONVERTER=ON ^ -DMAGNUM_WITH_ANYSCENECONVERTER=ON ^
-DMAGNUM_WITH_TGAIMPORTER=ON ^
%COMPILER_EXTRA% -G Ninja || exit /b %COMPILER_EXTRA% -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b

1
package/ci/unix-desktop-gles.sh

@ -46,6 +46,7 @@ cmake .. \
-DMAGNUM_WITH_WINDOWLESSEGLAPPLICATION=ON \ -DMAGNUM_WITH_WINDOWLESSEGLAPPLICATION=ON \
-DMAGNUM_WITH_ANYIMAGEIMPORTER=ON \ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON \
-DMAGNUM_WITH_ANYSCENECONVERTER=ON \ -DMAGNUM_WITH_ANYSCENECONVERTER=ON \
-DMAGNUM_WITH_TGAIMPORTER=ON \
-G Ninja -G Ninja
ninja install ninja install
cd ../.. cd ../..

1
package/ci/unix-desktop.sh

@ -47,6 +47,7 @@ cmake .. \
-DMAGNUM_WITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=ON \ -DMAGNUM_WITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=ON \
-DMAGNUM_WITH_ANYIMAGEIMPORTER=ON \ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON \
-DMAGNUM_WITH_ANYSCENECONVERTER=ON \ -DMAGNUM_WITH_ANYSCENECONVERTER=ON \
-DMAGNUM_WITH_TGAIMPORTER=ON \
-G Ninja -G Ninja
# In case of a static build there's no way for the test to know the plugin # In case of a static build there's no way for the test to know the plugin

11
src/python/magnum/test/test_trade.py

@ -1005,9 +1005,16 @@ class Importer(unittest.TestCase):
def test_set_preferred_plugins(self): def test_set_preferred_plugins(self):
manager = trade.ImporterManager() 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']) 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): def test_set_preferred_plugins_alias_not_found(self):
manager = trade.ImporterManager() manager = trade.ImporterManager()

Loading…
Cancel
Save