diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2015-09-03 14:09:16 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2015-09-03 14:09:16 +0300 |
commit | 8383a2d4cc32c8516f11364aae079aeae93116c9 (patch) | |
tree | bccd244c9f8e82a64d72ca7b6134d9a6d047802a /tests | |
parent | e5e65b1099c2d146614691c9e54c95b99f8d8685 (diff) |
Fix: Made bpy.path.ensure_ext compatible with compound extensions.
Extensions such as ".tar.gz" are now also supported. Before this patch,
ensure_ext('demo.tar.gz', '.tar.gz') would return 'demo.tar.tar.gz'.
This results in issues with the `ExportHelper` mix-in class; clicking
an existing file in the file dialogue warns about overwriting it
(highlighting the input box in red), but then saves to a different
file.
Also added a unit test for the new behaviour.
Reviewers: mont29, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D1498
Diffstat (limited to 'tests')
-rw-r--r-- | tests/python/bl_bpy_path.py | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/tests/python/bl_bpy_path.py b/tests/python/bl_bpy_path.py new file mode 100644 index 00000000000..5c4ae91a5df --- /dev/null +++ b/tests/python/bl_bpy_path.py @@ -0,0 +1,41 @@ +# Apache License, Version 2.0 + +# ./blender.bin --background -noaudio --python tests/python/bl_bpy_path.py -- --verbose +import unittest + + +class TestBpyPath(unittest.TestCase): + def test_ensure_ext(self): + from bpy.path import ensure_ext + + # Should work with both strings and bytes. + self.assertEqual(ensure_ext('demo', '.blend'), 'demo.blend') + self.assertEqual(ensure_ext(b'demo', b'.blend'), b'demo.blend') + + # Test different cases. + self.assertEqual(ensure_ext('demo.blend', '.blend'), 'demo.blend') + self.assertEqual(ensure_ext('demo.BLEND', '.blend'), 'demo.BLEND') + self.assertEqual(ensure_ext('demo.blend', '.BLEND'), 'demo.blend') + + # Test empty extensions, compound extensions etc. + self.assertEqual(ensure_ext('demo', 'blend'), 'demoblend') + self.assertEqual(ensure_ext('demo', ''), 'demo') + self.assertEqual(ensure_ext('demo', '.json.gz'), 'demo.json.gz') + self.assertEqual(ensure_ext('demo.json.gz', '.json.gz'), 'demo.json.gz') + self.assertEqual(ensure_ext('demo.json', '.json.gz'), 'demo.json.json.gz') + self.assertEqual(ensure_ext('', ''), '') + self.assertEqual(ensure_ext('', '.blend'), '.blend') + + # Test case-sensitive behaviour. + self.assertEqual(ensure_ext('demo', '.blend', True), 'demo.blend') + self.assertEqual(ensure_ext('demo.BLEND', '.blend', True), 'demo.BLEND.blend') + self.assertEqual(ensure_ext('demo', 'Blend', True), 'demoBlend') + self.assertEqual(ensure_ext('demoBlend', 'blend', True), 'demoBlendblend') + self.assertEqual(ensure_ext('demo', '', True), 'demo') + + +if __name__ == '__main__': + import sys + + sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []) + unittest.main() |