Fix test cases

thombashi · Jan 6, 2019 · 674d72f · 674d72f
1 parent 7af2e83
commit 674d72f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/pathvalidate/_file.py b/pathvalidate/_file.py
@@ -280,7 +280,11 @@ def sanitize(self, replacement_text=""):
     def _validate(self, value):
         self._validate_null_string(value)
 
-        file_path = os.path.normpath(os.path.splitdrive(value)[1])
+        value = os.path.splitdrive(value)[1]
+        if not value:
+            return
+
+        file_path = os.path.normpath(value)
         unicode_file_path = preprocess(file_path)
 
         self._validate_reserved_keywords(unicode_file_path)

diff --git a/test/test_file.py b/test/test_file.py
@@ -254,16 +254,16 @@ def test_exception(self, value, expected):
 class Test_validate_filepath(object):
     VALID_CHAR_LIST = VALID_PATH_CHARS
     VALID_MULTIBYTE_PATH_LIST = [
-        r"\\localhost\Users\新しいフォルダー\あいうえお.txt",
-        r"\\localhost\新しいフォルダー\ユーザ属性.txt",
+        "\\\\localhost\\Users\\新しいフォルダー\\あいうえお.txt",
+        "\\\\localhost\\新しいフォルダー\\ユーザ属性.txt",
     ]
     WIN_VALID_PATH_LIST = [
-        r"\\\localhost\Users\test\AppData\Local\Temp\pytest-of-test\pytest-0\test_exception__hoge_csv_heade1\hoge.csv",
-        r"\\localhost/Users/test/AppData/Local/Temp/pytest-of-test/pytest-0/test_exception__hoge_csv_heade1/hoge.csv",
-        r"\\localhost\Users\test\AppData/Local\Temp/pytest-of-test\pytest-0/test_exception__hoge_csv_heade1\hoge.csv",
-        r"\\localhost\Users",
+        "\\\\localhost\\Users\\\est\\AppData\\Local\\Temp\\pytest-of-test\\pytest-0\\\hoge.csv",
+        "\\\\localhost/Users/test/AppData/Local/Temp/pytest-of-test/pytest-0/test_exception__hoge_csv_heade1/hoge.csv",
+        "\\\\localhost\\Users\\est\\AppData/Local\\Temp/pytest-of-test\\pytest-0/\hoge.csv",
+        "\\\\localhost\\Users",
         "\\\\localhost\\",
-        r"\Users",
+        "\\Users",
     ]
 
     @pytest.mark.parametrize(
@@ -298,7 +298,7 @@ def test_normal_multibyte(self, value, platform):
 
     @pytest.mark.parametrize(["value"], [[valid_path] for valid_path in WIN_VALID_PATH_LIST])
     def test_normal_win(self, value):
-        validate_filepath(value, "windows")
+        validate_filepath(value, platform="windows")
 
     @pytest.mark.parametrize(
         ["value", "platform", "max_len", "expected"],
@@ -383,21 +383,15 @@ class Test_validate_win_file_path(object):
     @pytest.mark.parametrize(
         ["value"],
         [
+            ["C:\\Users\\est\\AppData\\Local\\Temp\\pytest-of-test\\pytest-0\\\hoge.csv"],
+            ["Z:\\Users\\est\\AppData\\Local\\Temp\\pytest-of-test\\pytest-0\\hoge.csv"],
             [
-                r"C:\Users\test\AppData\Local\Temp\pytest-of-test\pytest-0\test_exception__hoge_csv_heade1\hoge.csv"
+                "C:/Users/est/AppData/Local/Temp/pytest-of-test/pytest-0/test_exception__hoge_csv_heade1/hoge.csv"
             ],
-            [
-                r"Z:\Users\test\AppData\Local\Temp\pytest-of-test\pytest-0\test_exception__hoge_csv_heade1\hoge.csv"
-            ],
-            [
-                r"C:/Users/test/AppData/Local/Temp/pytest-of-test/pytest-0/test_exception__hoge_csv_heade1/hoge.csv"
-            ],
-            [
-                r"C:\Users/test\AppData/Local\Temp/pytest-of-test\pytest-0/test_exception__hoge_csv_heade1\hoge.csv"
-            ],
-            [r"C:\Users"],
+            ["C:\\Users/est\\AppData/Local\\Temp/pytest-of-test\\pytest-0/hoge.csv"],
+            ["C:\\Users"],
             ["C:\\"],
-            [r"\Users"],
+            ["\\Users"],
         ],
     )
     def test_normal(self, value):