[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - test_nameregistry.py:1.3

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/services/tests
In directory cvs.zope.org:/tmp/cvs-serv2970/src/zope/app/services/tests

Modified Files:
	test_nameregistry.py 
Log Message:
Got rid of NameRegistry.


=== Zope3/src/zope/app/services/tests/test_nameregistry.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/tests/test_nameregistry.py:1.2	Sun Sep 21 13:31:13 2003
+++ Zope3/src/zope/app/services/tests/test_nameregistry.py	Sat Mar  6 17:20:48 2004
@@ -18,7 +18,6 @@
 
 from unittest import TestCase, TestSuite, main, makeSuite
 
-from zope.app.services.registration import NameRegistry
 from zope.app.services.registration import NameComponentRegistry
 
 class RegistrationStub:
@@ -43,11 +42,11 @@
         return self._active
 
 
-class TestNameRegistry(TestCase):
+class TestNameComponentRegistry(TestCase):
 
     def setUp(self):
         self.container = object()
-        self.subject = NameRegistry()
+        self.subject = NameComponentRegistry()
         self.subject.__parent__ = self.container
 
     def test_queryRegistrationsFor(self):
@@ -110,13 +109,6 @@
         subject._bindings['Bar'] = 0   # false values should be filtered out
         self.assertEquals(tuple(subject.listRegistrationNames()), ('Foo',))
 
-class TestNameComponentRegistry(TestNameRegistry):
-
-    def setUp(self):
-        self.container = object()
-        self.subject = NameComponentRegistry()
-        self.subject.__parent__ = self.container
-
     def test_queryActiveComponent(self):
         subject = self.subject
         self.assertEquals(subject.queryActiveComponent('xyzzy'), None)
@@ -131,10 +123,7 @@
 
 
 def test_suite():
-    return TestSuite((
-        makeSuite(TestNameRegistry),
-        makeSuite(TestNameComponentRegistry),
-        ))
+    return makeSuite(TestNameComponentRegistry)
 
 
 if __name__=='__main__':