Update test cases

Author: thombashi

test/_common.py

@@ -95,6 +95,22 @@
     "{:s}{:d}".format(name, num)
     for name, num in product(["COM", "com", "LPT", "lpt"], range(1, 10))
 ]
+NTFS_RESERVED_FILE_NAMES = [
+    "$Mft",
+    "$MftMirr",
+    "$LogFile",
+    "$Volume",
+    "$AttrDef",
+    "$Bitmap",
+    "$Boot",
+    "$BadClus",
+    "$Secure",
+    "$Upcase",
+    "$Extend",
+    "$Quota",
+    "$ObjId",
+    "$Reparse",
+]
 
 
 def randstr(length, char_list=alphanum_chars):

test/test_filename.py

@@ -33,6 +33,7 @@
     INVALID_PATH_CHARS,
     INVALID_WIN_FILENAME_CHARS,
     INVALID_WIN_PATH_CHARS,
+    NTFS_RESERVED_FILE_NAMES,
     VALID_FILENAME_CHARS,
     VALID_PLATFORM_NAMES,
     WIN_RESERVED_FILE_NAMES,
@@ -123,13 +124,17 @@ class Test_validate_filename(object):
         chain.from_iterable(
             [
                 [
-                    arg_list
-                    for arg_list in product(
+                    args
+                    for args in product(
                         ["{0}{1}{0}".format(randstr(64), valid_c)], VALID_PLATFORM_NAMES
                     )
                 ]
                 for valid_c in VALID_CHARS
             ]
+            + [
+                [args for args in product([filename], VALID_PLATFORM_NAMES)]
+                for filename in NTFS_RESERVED_FILE_NAMES
+            ]
         ),
     )
     def test_normal(self, value, platform):
@@ -140,7 +145,7 @@ def test_normal(self, value, platform):
         ["value", "platform"],
         chain.from_iterable(
             [
-                [arg_list for arg_list in product([multibyte_name], VALID_PLATFORM_NAMES)]
+                [args for args in product([multibyte_name], VALID_PLATFORM_NAMES)]
                 for multibyte_name in VALID_MULTIBYTE_NAMES
             ]
         ),
@@ -214,8 +219,8 @@ def test_locale_ja(self, locale):
         chain.from_iterable(
             [
                 [
-                    arg_list
-                    for arg_list in product(
+                    args
+                    for args in product(
                         ["{0}{1}{0}".format(randstr(64), invalid_c)], VALID_PLATFORM_NAMES
                     )
                 ]

test/test_filepath.py

@@ -31,6 +31,7 @@
 from ._common import (
     INVALID_PATH_CHARS,
     INVALID_WIN_PATH_CHARS,
+    NTFS_RESERVED_FILE_NAMES,
     VALID_PATH_CHARS,
     VALID_PLATFORM_NAMES,
     WIN_RESERVED_FILE_NAMES,
@@ -130,8 +131,8 @@ class Test_validate_filepath(object):
         chain.from_iterable(
             [
                 [
-                    arg_list
-                    for arg_list in product(
+                    args
+                    for args in product(
                         ["/{0}/{1}{0}".format(randstr(64), valid_c)], VALID_PLATFORM_NAMES
                     )
                 ]
@@ -147,7 +148,7 @@ def test_normal(self, value, platform):
         ["value", "platform"],
         chain.from_iterable(
             [
-                [arg_list for arg_list in product([valid_path], VALID_PLATFORM_NAMES)]
+                [args for args in product([valid_path], VALID_PLATFORM_NAMES)]
                 for valid_path in VALID_MULTIBYTE_PATH_LIST
             ]
         ),
@@ -271,6 +272,35 @@ def test_exception_invalid_win_char(self, value, platform):
             validate_filepath(value, platform=platform)
         assert not is_valid_filepath(value, platform=platform)
 
+    @pytest.mark.parametrize(
+        ["value", "platform", "expected"],
+        [
+            ["abc\\{}\\xyz".format(reserved_keyword), platform, ReservedNameError]
+            for reserved_keyword, platform in product(WIN_RESERVED_FILE_NAMES, ["linux", "macos"])
+            if reserved_keyword not in [".", ".."]
+        ]
+        + [
+            ["/foo/abc/{}.txt".format(reserved_keyword), platform, ReservedNameError]
+            for reserved_keyword, platform in product(WIN_RESERVED_FILE_NAMES, ["linux", "macos"])
+            if reserved_keyword not in [".", ".."]
+        ]
+        + [
+            ["{}\\{}".format(drive, filename), platform, ReservedNameError]
+            for drive, platform, filename in product(
+                ["C:", "D:"], ["linux", "macos"], NTFS_RESERVED_FILE_NAMES
+            )
+        ]
+        + [
+            ["{}\\abc\\{}".format(drive, filename), platform, ReservedNameError]
+            for drive, platform, filename in product(
+                ["C:", "D:"], ["windows", "universal"], NTFS_RESERVED_FILE_NAMES
+            )
+        ],
+    )
+    def test_normal_reserved_name(self, value, platform, expected):
+        validate_filepath(value, platform=platform)
+        assert is_valid_filepath(value, platform=platform)
+
     @pytest.mark.parametrize(
         ["value", "platform", "expected"],
         [
@@ -286,10 +316,17 @@ def test_exception_invalid_win_char(self, value, platform):
                 WIN_RESERVED_FILE_NAMES, ["windows", "universal"]
             )
             if reserved_keyword not in [".", ".."]
+        ]
+        + [
+            ["{}\\{}".format(drive, filename), platform, ReservedNameError]
+            for drive, platform, filename in product(
+                ["C:", "D:"], ["windows", "universal"], NTFS_RESERVED_FILE_NAMES
+            )
         ],
     )
     def test_exception_reserved_name(self, value, platform, expected):
         with pytest.raises(expected) as e:
+            print(platform, value)
             validate_filepath(value, platform=platform)
         assert e.value.reusable_name is False
         assert e.value.reserved_name
@@ -419,6 +456,18 @@ def test_normal_str(self, platform, value, replace_text, expected):
             ]
             for reserved_keyword, platform in product(WIN_RESERVED_FILE_NAMES, ["windows"])
             if reserved_keyword not in [".", ".."]
+        ]
+        + [
+            ["{}\\{}".format(drive, filename), platform, "{}/{}_".format(drive, filename)]
+            for drive, platform, filename in product(
+                ["C:", "D:"], ["universal"], NTFS_RESERVED_FILE_NAMES
+            )
+        ]
+        + [
+            ["{}\\{}".format(drive, filename), platform, "{}\\{}_".format(drive, filename)]
+            for drive, platform, filename in product(
+                ["C:", "D:"], ["windows"], NTFS_RESERVED_FILE_NAMES
+            )
         ],
     )
     def test_normal_reserved_name(self, value, test_platform, expected):