Rev 3211: Some cleanup. in file:///v/home/vila/src/bzr/experimental/selftest/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/experimental/selftest/

------------------------------------------------------------
revno: 3211
revision-id:v.ladeuil+lp at free.fr-20080210202350-wo0x3tjdorw1og6x
parent: v.ladeuil+lp at free.fr-20080209111045-v52cct05czkwth0l
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest
timestamp: Sun 2008-02-10 21:23:50 +0100
message:
  Some cleanup.
  
  * bzrlib/tests/test_selftest.py:
  Update tests.
  
  * bzrlib/tests/__init__.py:
  (TestIdList.is_module_name_used): Renamed to refers_to.
  	
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-02-09 11:10:45 +0000
+++ b/bzrlib/tests/__init__.py	2008-02-10 20:23:50 +0000
@@ -2270,7 +2270,7 @@
     :return: A callable that returns True if the test's id appears in the list.
     """
     def condition(test):
-        return id_list.test_in(test.id())
+        return id_list.includes(test.id())
     return condition
 
 
@@ -2607,11 +2607,11 @@
                 modules[mod_name] = True
         self.modules = modules
 
-    def is_module_name_used(self, module_name):
+    def refers_to(self, module_name):
         """Is there tests for the module or one of its sub modules."""
         return self.modules.has_key(module_name)
 
-    def test_in(self, test_id):
+    def includes(self, test_id):
         return self.tests.has_key(test_id)
 
 
@@ -2764,16 +2764,14 @@
     if keep_only is None:
         suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
     else:
-        for mod in [m for m in testmod_names
-                    if id_filter.is_module_name_used(m)]:
+        for mod in [m for m in testmod_names if id_filter.refers_to(m)]:
             mod_suite = loader.loadTestsFromModuleNames([mod])
             mod_suite = filter_suite_by_id_list(mod_suite, id_filter)
             suite.addTest(mod_suite)
 
     # modules defining their own test_suite()
     for package in [p for p in packages_to_test()
-                    if (keep_only is None
-                        or id_filter.is_module_name_used(p.__name__))]:
+                    if (keep_only is None or id_filter.refers_to(p.__name__))]:
         pack_suite = package.test_suite()
         if keep_only is not None:
             pack_suite = filter_suite_by_id_list(pack_suite, id_filter)
@@ -2793,8 +2791,7 @@
     default_encoding = sys.getdefaultencoding()
     for name, plugin in  [(n, p) for (n, p) in bzrlib.plugin.plugins().items()
                           if (keep_only is None
-                              or id_filter.is_module_name_used(
-                p.module.__name__))]:
+                              or id_filter.refers_to(p.module.__name__))]:
         try:
             plugin_suite = plugin.test_suite()
         except ImportError, e:

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2008-01-29 08:21:19 +0000
+++ b/bzrlib/tests/test_selftest.py	2008-02-10 20:23:50 +0000
@@ -1954,23 +1954,23 @@
              'mod1.submod1',
              'mod1.submod2.cl1.meth1', 'mod1.submod2.cl2.meth2',
              ])
-        self.assertTrue(id_list.is_module_name_used('mod1'))
-        self.assertTrue(id_list.is_module_name_used('mod1.submod1'))
-        self.assertTrue(id_list.is_module_name_used('mod1.submod2'))
-        self.assertTrue(id_list.test_in('mod1.cl1.meth1'))
-        self.assertTrue(id_list.test_in('mod1.submod1'))
-        self.assertTrue(id_list.test_in('mod1.func1'))
+        self.assertTrue(id_list.refers_to('mod1'))
+        self.assertTrue(id_list.refers_to('mod1.submod1'))
+        self.assertTrue(id_list.refers_to('mod1.submod2'))
+        self.assertTrue(id_list.includes('mod1.cl1.meth1'))
+        self.assertTrue(id_list.includes('mod1.submod1'))
+        self.assertTrue(id_list.includes('mod1.func1'))
 
     def test_bad_chars_in_params(self):
         id_list = self._create_id_list(['mod1.cl1.meth1(xx.yy)'])
-        self.assertTrue(id_list.is_module_name_used('mod1'))
-        self.assertTrue(id_list.test_in('mod1.cl1.meth1(xx.yy)'))
+        self.assertTrue(id_list.refers_to('mod1'))
+        self.assertTrue(id_list.includes('mod1.cl1.meth1(xx.yy)'))
 
     def test_module_used(self):
         id_list = self._create_id_list(['mod.class.meth'])
-        self.assertTrue(id_list.is_module_name_used('mod'))
-        self.assertTrue(id_list.is_module_name_used('mod.class'))
-        self.assertTrue(id_list.is_module_name_used('mod.class.meth'))
+        self.assertTrue(id_list.refers_to('mod'))
+        self.assertTrue(id_list.refers_to('mod.class'))
+        self.assertTrue(id_list.refers_to('mod.class.meth'))
 
     def test_test_suite(self):
         # This test is slow, so we do a single test with one test in each