assertEqualNormCase() --> assertEqual()

Author: barneygale

Lib/test/test_pathlib.py

@@ -1463,20 +1463,20 @@ def test_absolute_common(self):
             getcwd.return_value = BASE
 
             # Simple relative paths
-            self.assertEqualNormCase(str(P().absolute()), BASE)
-            self.assertEqualNormCase(str(P('.').absolute()), BASE)
-            self.assertEqualNormCase(str(P('a').absolute()), os.path.join(BASE, 'a'))
-            self.assertEqualNormCase(str(P('a', 'b', 'c').absolute()), os.path.join(BASE, 'a', 'b', 'c'))
+            self.assertEqual(str(P().absolute()), BASE)
+            self.assertEqual(str(P('.').absolute()), BASE)
+            self.assertEqual(str(P('a').absolute()), os.path.join(BASE, 'a'))
+            self.assertEqual(str(P('a', 'b', 'c').absolute()), os.path.join(BASE, 'a', 'b', 'c'))
 
             # Symlinks should not be resolved
-            self.assertEqualNormCase(str(P('linkB', 'fileB').absolute()), os.path.join(BASE, 'linkB', 'fileB'))
-            self.assertEqualNormCase(str(P('brokenLink').absolute()), os.path.join(BASE, 'brokenLink'))
-            self.assertEqualNormCase(str(P('brokenLinkLoop').absolute()), os.path.join(BASE, 'brokenLinkLoop'))
+            self.assertEqual(str(P('linkB', 'fileB').absolute()), os.path.join(BASE, 'linkB', 'fileB'))
+            self.assertEqual(str(P('brokenLink').absolute()), os.path.join(BASE, 'brokenLink'))
+            self.assertEqual(str(P('brokenLinkLoop').absolute()), os.path.join(BASE, 'brokenLinkLoop'))
 
             # '..' entries should be preserved and not normalised
-            self.assertEqualNormCase(str(P('..').absolute()), os.path.join(BASE, '..'))
-            self.assertEqualNormCase(str(P('a', '..').absolute()), os.path.join(BASE, 'a', '..'))
-            self.assertEqualNormCase(str(P('..', 'b').absolute()), os.path.join(BASE, '..', 'b'))
+            self.assertEqual(str(P('..').absolute()), os.path.join(BASE, '..'))
+            self.assertEqual(str(P('a', '..').absolute()), os.path.join(BASE, 'a', '..'))
+            self.assertEqual(str(P('..', 'b').absolute()), os.path.join(BASE, '..', 'b'))
 
     def _test_home(self, p):
         q = self.cls(os.path.expanduser('~'))
@@ -2481,14 +2481,14 @@ class PosixPathTest(_BasePathTest, unittest.TestCase):
 
     def test_absolute(self):
         P = self.cls
-        self.assertEqualNormCase(str(P('/').absolute()), '/')
-        self.assertEqualNormCase(str(P('/a').absolute()), '/a')
-        self.assertEqualNormCase(str(P('/a/b').absolute()), '/a/b')
+        self.assertEqual(str(P('/').absolute()), '/')
+        self.assertEqual(str(P('/a').absolute()), '/a')
+        self.assertEqual(str(P('/a/b').absolute()), '/a/b')
 
         # '//'-prefixed absolute path (supported by POSIX)
-        self.assertEqualNormCase(str(P('//').absolute()), '//')
-        self.assertEqualNormCase(str(P('//a').absolute()), '//a')
-        self.assertEqualNormCase(str(P('//a/b').absolute()), '//a/b')
+        self.assertEqual(str(P('//').absolute()), '//')
+        self.assertEqual(str(P('//a').absolute()), '//a')
+        self.assertEqual(str(P('//a/b').absolute()), '//a/b')
 
     def _check_symlink_loop(self, *args, strict=True):
         path = self.cls(*args)
@@ -2659,26 +2659,25 @@ def test_absolute(self):
         P = self.cls
 
         # Simple absolute paths
-        self.assertEqualNormCase(str(P('c:\\').absolute()), 'c:\\')
-        self.assertEqualNormCase(str(P('c:\\a').absolute()), 'c:\\a')
-        self.assertEqualNormCase(str(P('c:\\a\\b').absolute()), 'c:\\a\\b')
+        self.assertEqual(str(P('c:\\').absolute()), 'c:\\')
+        self.assertEqual(str(P('c:\\a').absolute()), 'c:\\a')
+        self.assertEqual(str(P('c:\\a\\b').absolute()), 'c:\\a\\b')
 
         # UNC absolute paths
         share = '\\\\server\\share\\'
-        self.assertEqualNormCase(str(P(share).absolute()), share)
-        self.assertEqualNormCase(str(P(share + 'a').absolute()), share + 'a')
-        self.assertEqualNormCase(str(P(share + 'a\\b').absolute()), share + 'a\\b')
+        self.assertEqual(str(P(share).absolute()), share)
+        self.assertEqual(str(P(share + 'a').absolute()), share + 'a')
+        self.assertEqual(str(P(share + 'a\\b').absolute()), share + 'a\\b')
 
         # UNC relative paths
         with mock.patch("pathlib._normal_accessor.getcwd") as getcwd:
             getcwd.return_value = share
 
-            self.assertEqualNormCase(str(P().absolute()), share)
-            self.assertEqualNormCase(str(P('.').absolute()), share)
-            self.assertEqualNormCase(str(P('a').absolute()),
-                                     os.path.join(share, 'a'))
-            self.assertEqualNormCase(str(P('a', 'b', 'c').absolute()),
-                                     os.path.join(share, 'a', 'b', 'c'))
+            self.assertEqual(str(P().absolute()), share)
+            self.assertEqual(str(P('.').absolute()), share)
+            self.assertEqual(str(P('a').absolute()), os.path.join(share, 'a'))
+            self.assertEqual(str(P('a', 'b', 'c').absolute()),
+                             os.path.join(share, 'a', 'b', 'c'))
 
 
     def test_glob(self):