use 'pattern in testname' rather than 'testname.startswith(pattern'common-version-0_16_1

2 files changed, 14 insertions, 25 deletions

diff --git a/test/unittest_testlib.py b/test/unittest_testlib.py
index b365ff5..48f11bc 100644
--- a/test/unittest_testlib.py
+++ b/test/unittest_testlib.py
@@ -247,24 +247,21 @@ class TestLoaderTC(TestCase):
         self.assertEquals(len(collected), 1)
 
     def test_collect_with_classname_and_pattern(self):
-        collected = self.loader.loadTestsFromName('FooTC.test_foo1', self.module)
-        self.assertEquals(len(collected), 1)
-        collected = self.loader.loadTestsFromName('FooTC.test_foo', self.module)
-        self.assertEquals(len(collected), 2)
+        data = [('FooTC.test_foo1', 1), ('FooTC.test_foo', 2), ('FooTC.test_fo', 2),
+                ('FooTC.foo1', 1), ('FooTC.foo', 2), ('FooTC.whatever', 0)
+                ]
+        for pattern, expected_count in data:
+            collected = self.loader.loadTestsFromName(pattern, self.module)
+            yield self.assertEquals, len(collected), expected_count
         
     def test_collect_with_pattern(self):
-        collected = self.loader.loadTestsFromName('test_foo1', self.module)
-        self.assertEquals(len(collected), 1)
-        collected = self.loader.loadTestsFromName('test_foo', self.module)
-        self.assertEquals(len(collected), 2)
-        collected = self.loader.loadTestsFromName('test_bar', self.module)
-        self.assertEquals(len(collected), 2)
-        collected = self.loader.loadTestsFromName('foo1', self.module)
-        self.assertEquals(len(collected), 1)
-        collected = self.loader.loadTestsFromName('foo', self.module)
-        self.assertEquals(len(collected), 2)
-        collected = self.loader.loadTestsFromName('bar', self.module)
-        self.assertEquals(len(collected), 2)
+        data = [('test_foo1', 1), ('test_foo', 2), ('test_bar', 2),
+                ('foo1', 1), ('foo', 2), ('bar', 2), ('ba', 2),
+                ('test', 4), ('ab', 0),
+                ]
+        for pattern, expected_count in data:
+            collected = self.loader.loadTestsFromName(pattern, self.module)
+            yield self.assertEquals, len(collected), expected_count
 
     
 if __name__ == '__main__':
diff --git a/testlib.py b/testlib.py
index 9b1bb28..5b1b762 100644
--- a/testlib.py
+++ b/testlib.py
@@ -447,15 +447,7 @@ class NonStrictTestLoader(unittest.TestLoader):
         >>> self._test_should_be_collected('test_foobar', 'testfoo')
         False
         """
-        prefix = self.testMethodPrefix
-        # case where testname="test_some" and methodname="test_something"
-        if pattern.startswith(prefix):
-            return methodname.startswith(pattern)
-        # case where pattern="foo" and methodname="testfoo" or "test_foo"
-        if methodname.startswith(prefix + pattern) or \
-               methodname.startswith(prefix + '_' + pattern):
-            return True
-        return False
+        return pattern in methodname
 
 class SkipAwareTestProgram(unittest.TestProgram):
     # XXX: don't try to stay close to unittest.py, use optparse