maintenance: remove unittest from test_pathmapper

Author: psafont

tests/test_pathmapper.py

@@ -1,96 +1,90 @@
-from __future__ import absolute_import
-
-import unittest
+import pytest
 
 from cwltool.pathmapper import PathMapper, normalizeFilesDirs
 
 
-class TestPathMapper(unittest.TestCase):
-    def test_subclass(self):
-        class SubPathMapper(PathMapper):
-            def __init__(self, referenced_files, basedir, stagedir, new):
-                super(SubPathMapper, self).__init__(referenced_files, basedir, stagedir)
-                self.new = new
-
-        a = SubPathMapper([], '', '', "new")
-        self.assertTrue(a.new, "new")
-
-    def test_strip_trailing(self):
-        d = {
-                "class": "Directory",
-                "location": "/foo/bar/"
-            }
-        normalizeFilesDirs(d)
-        self.assertEqual(
-            {
-                "class": "Directory",
-                "location": "/foo/bar",
-                "basename": "bar"
-            },
-            d)
-
-    def test_basename_field_generation(self):
-        base_file = {
-            "class": "File",
-            "location": "/foo/"
-        }
-        # (filename, expected: (nameroot, nameext))
-        testdata = [
-            ("foo.bar",     ("foo",     ".bar")),
-            ("foo",         ("foo",     '')),
-            (".foo",        (".foo",    '')),
-            ("foo.",        ("foo",    '.')),
-            ("foo.bar.baz", ("foo.bar", ".baz"))
-        ]
+def test_subclass():
+    class SubPathMapper(PathMapper):
+        def __init__(self, referenced_files, basedir, stagedir, new):
+            super(SubPathMapper, self).__init__(referenced_files, basedir, stagedir)
+            self.new = new
 
-        for filename, (nameroot, nameext) in testdata:
-            file = dict(base_file)
-            file["location"] = file["location"] + filename
+    pathmap = SubPathMapper([], '', '', 'new')
+    assert pathmap.new is not None, 'new'
 
-            expected = dict(file)
-            expected["basename"] = filename
-            expected["nameroot"] = nameroot
-            expected["nameext"] = nameext
+normalization_parameters = [
+    ('strip trailing slashes',
+     {'class': 'Directory',
+      'location': '/foo/bar/'
+      },
+     {'class': 'Directory',
+      'location': '/foo/bar',
+      'basename': 'bar'
+      }
+     ),
+    ('file',
+     {'class': 'File',
+      'location': 'file1.txt'
+      },
+     {'class': 'File',
+      'location': 'file1.txt',
+      'basename': 'file1.txt',
+      'nameext': '.txt',
+      'nameroot': 'file1'
+      }
+     ),
+    ('file with local uri',
+     {'class': 'File',
+      'location': 'file:///foo/file1.txt'
+      },
+     {'class': 'File',
+      'location': 'file:///foo/file1.txt',
+      'basename': 'file1.txt',
+      'nameext': '.txt',
+      'nameroot': 'file1'
+      }
+     ),
+    ('file with http url',
+     {'class': 'File',
+      'location': 'http://example.com/file1.txt'
+      },
+     {'class': 'File',
+      'location': 'http://example.com/file1.txt',
+      'basename': 'file1.txt',
+      'nameext': '.txt',
+      'nameroot': 'file1'
+      }
+     )
+]
 
-            normalizeFilesDirs(file)
-            self.assertEqual(file, expected)
+@pytest.mark.parametrize('name,file_dir,expected', normalization_parameters)
+def test_normalizeFilesDirs(name, file_dir, expected):
+    normalizeFilesDirs(file_dir)
+    assert file_dir == expected, name
 
-    def test_normalizeFilesDirs(self):
-        n = {
-            "class": "File",
-            "location": "file1.txt"
-        }
-        normalizeFilesDirs(n)
-        self.assertEqual(n, {
-            "class": "File",
-            "location": "file1.txt",
-            'basename': 'file1.txt',
-            'nameext': '.txt',
-            'nameroot': 'file1'
-        })
+# (filename, expected: (nameroot, nameext))
+basename_generation_parameters = [
+    ('foo.bar', ('foo', '.bar')),
+    ('foo', ('foo', '')),
+    ('.foo', ('.foo', '')),
+    ('foo.', ('foo', '.')),
+    ('foo.bar.baz', ('foo.bar', '.baz'))
+]
+@pytest.mark.parametrize('filename,expected', basename_generation_parameters)
+def test_basename_field_generation(filename, expected):
+    nameroot, nameext = expected
+    expected = {
+        'class': 'File',
+        'location': '/foo/' + filename,
+        'basename': filename,
+        'nameroot': nameroot,
+        'nameext': nameext
+    }
 
-        n = {
-            "class": "File",
-            "location": "file:///foo/file1.txt"
-        }
-        normalizeFilesDirs(n)
-        self.assertEqual(n, {
-            "class": "File",
-            "location": "file:///foo/file1.txt",
-            'basename': 'file1.txt',
-            'nameext': '.txt',
-            'nameroot': 'file1'
-        })
+    file = {
+        'class': 'File',
+        'location': '/foo/' + filename
+    }
 
-        n = {
-            "class": "File",
-            "location": "http://example.com/file1.txt"
-        }
-        normalizeFilesDirs(n)
-        self.assertEqual(n, {
-            "class": "File",
-            "location": "http://example.com/file1.txt",
-            'basename': 'file1.txt',
-            'nameext': '.txt',
-            'nameroot': 'file1'
-        })
+    normalizeFilesDirs(file)
+    assert file == expected