[Python-checkins] r78794 - in python/trunk/Lib/test: test_genericpath.py test_macpath.py

Mon Mar 8 13:39:35 CET 2010

Author: florent.xicluna
Date: Mon Mar 8 13:39:35 2010
New Revision: 78794
Log:
Move some tests from test_macpath to test_genericpath.CommonTest
Modified:
 python/trunk/Lib/test/test_genericpath.py
 python/trunk/Lib/test/test_macpath.py
Modified: python/trunk/Lib/test/test_genericpath.py
==============================================================================

--- python/trunk/Lib/test/test_genericpath.py	(original)
+++ python/trunk/Lib/test/test_genericpath.py	Mon Mar 8 13:39:35 2010
@@ -47,6 +47,18 @@
 commonprefix(["/home/swen/spam", "/home/swen/spam"]),
 "/home/swen/spam"
 )
+ self.assertEqual(
+ commonprefix(["home:swenson:spam", "home:swen:spam"]),
+ "home:swen"
+ )
+ self.assertEqual(
+ commonprefix([":home:swen:spam", ":home:swen:eggs"]),
+ ":home:swen:"
+ )
+ self.assertEqual(
+ commonprefix([":home:swen:spam", ":home:swen:spam"]),
+ ":home:swen:spam"
+ )
 
 testlist = ['', 'abc', 'Xbcd', 'Xb', 'XY', 'abcd',
 'aXc', 'abd', 'ab', 'aX', 'abcX']
Modified: python/trunk/Lib/test/test_macpath.py
==============================================================================
--- python/trunk/Lib/test/test_macpath.py	(original)
+++ python/trunk/Lib/test/test_macpath.py	Mon Mar 8 13:39:35 2010
@@ -18,16 +18,6 @@
 self.assertFalse(isabs(":foo:bar"))
 self.assertFalse(isabs(":foo:bar:"))
 
-
- def test_commonprefix(self):
- commonprefix = macpath.commonprefix
- self.assertEqual(commonprefix(["home:swenson:spam", "home:swen:spam"]),
- "home:swen")
- self.assertEqual(commonprefix([":home:swen:spam", ":home:swen:eggs"]),
- ":home:swen:")
- self.assertEqual(commonprefix([":home:swen:spam", ":home:swen:spam"]),
- ":home:swen:spam")
-
 def test_split(self):
 split = macpath.split
 self.assertEqual(split("foo:bar"),
