Get rid of add_adapter and add_utility APIs (config.registry.registerAdapter and config.registry.registerUtility will work).

2 files changed, 17 insertions, 48 deletions

diff --git a/repoze/bfg/tests/test_configuration.py b/repoze/bfg/tests/test_configuration.py
index a303f550f..3b7c50f60 100644
--- a/repoze/bfg/tests/test_configuration.py
+++ b/repoze/bfg/tests/test_configuration.py
@@ -1833,37 +1833,6 @@ class ConfiguratorTests(unittest.TestCase):
         result = render_view_to_response(ctx, req, 'pod_notinit')
         self.assertEqual(result, None)
 
-    def test_add_subscription_adapter(self):
-        config = self._makeOne()
-        def factory(abc): pass
-        config.add_subscription_adapter(factory, (IDummy,), IDummy,
-                                        info='info')
-        adapters = config.registry.registeredSubscriptionAdapters()
-        self.assertEqual(list(adapters)[0].factory, factory)
-
-    def test_add_adapter(self):
-        config = self._makeOne()
-        def factory(abc): return 'OK'
-        config.add_adapter(factory, (IDummy,), IDummy, name='foo',
-                           info='info')
-        result = config.registry.adapters.lookup((IDummy,), IDummy, name='foo')
-        self.assertEqual(result(None), 'OK')
-        
-    def test_add_utility_no_factory(self):
-        config = self._makeOne()
-        def component(): pass
-        config.add_utility(component, IDummy, name='foo', info='info')
-        result = config.registry.queryUtility(IDummy, name='foo')
-        self.assertEqual(result, component)
-
-    def test_add_utility_with_factory(self):
-        config = self._makeOne()
-        def factory(): return 'OK'
-        config.add_utility(None, IDummy, name='foo', info='info',
-                           factory=factory)
-        result = config.registry.queryUtility(IDummy, name='foo')
-        self.assertEqual(result, 'OK')
-
     def test_testing_securitypolicy(self):
         from repoze.bfg.testing import DummySecurityPolicy
         config = self._makeOne()
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index 59254846f..b50f841c2 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -724,7 +724,7 @@ class TestAdapterDirective(unittest.TestCase):
                       provides=None, for_=None)
 
     def test_for_is_None_adaptedBy_set(self):
-        from repoze.bfg.configuration import Configurator
+        from repoze.bfg.registry import Registry
         context = DummyContext()
         factory = DummyFactory()
         factory.__component_adapts__ = (IDummy,)
@@ -734,7 +734,7 @@ class TestAdapterDirective(unittest.TestCase):
         self.assertEqual(regadapt['discriminator'],
                          ('adapter', (IDummy,), IFactory, ''))
         self.assertEqual(regadapt['callable'].im_func,
-                         Configurator.add_adapter.im_func)
+                         Registry.registerAdapter.im_func)
         self.assertEqual(regadapt['args'],
                          (factory, (IDummy,), IFactory, '', None))
 
@@ -745,14 +745,14 @@ class TestAdapterDirective(unittest.TestCase):
                           provides=None, for_=(IDummy,))
 
     def test_provides_obtained_via_implementedBy(self):
-        from repoze.bfg.configuration import Configurator
+        from repoze.bfg.registry import Registry
         context = DummyContext()
         self._callFUT(context, [DummyFactory], for_=(IDummy,))
         regadapt = context.actions[0]
         self.assertEqual(regadapt['discriminator'],
                          ('adapter', (IDummy,), IFactory, ''))
         self.assertEqual(regadapt['callable'].im_func,
-                         Configurator.add_adapter.im_func)
+                         Registry.registerAdapter.im_func)
         self.assertEqual(regadapt['args'],
                          (DummyFactory, (IDummy,), IFactory, '', None))
 
@@ -772,7 +772,7 @@ class TestAdapterDirective(unittest.TestCase):
                           for_=(IDummy, IDummy))
         
     def test_rolled_up_factories(self):
-        from repoze.bfg.configuration import Configurator
+        from repoze.bfg.registry import Registry
         context = DummyContext()
         factory = DummyFactory()
         self._callFUT(context,
@@ -783,7 +783,7 @@ class TestAdapterDirective(unittest.TestCase):
         self.assertEqual(regadapt['discriminator'],
                          ('adapter', (IDummy,), IFactory, ''))
         self.assertEqual(regadapt['callable'].im_func,
-                         Configurator.add_adapter.im_func)
+                         Registry.registerAdapter.im_func)
         self.assertEqual(regadapt['args'][0].__module__, 'repoze.bfg.zcml')
 
 class TestSubscriberDirective(unittest.TestCase):
@@ -830,7 +830,7 @@ class TestSubscriberDirective(unittest.TestCase):
                           factory=factory, handler=None, provides=IFactory)
         
     def test_register_with_factory(self):
-        from repoze.bfg.configuration import Configurator
+        from repoze.bfg.registry import Registry
         context = DummyContext()
         factory = DummyFactory()
         self._callFUT(context, for_=(IDummy,),
@@ -839,9 +839,9 @@ class TestSubscriberDirective(unittest.TestCase):
         subadapt = context.actions[0]
         self.assertEqual(subadapt['discriminator'], None)
         self.assertEqual(subadapt['callable'].im_func,
-                         Configurator.add_subscription_adapter.im_func)
+                         Registry.registerSubscriptionAdapter.im_func)
         self.assertEqual(subadapt['args'],
-                         (factory, (IDummy,), IFactory, None) )
+                         (factory, (IDummy,), IFactory, None, None) )
 
     def test_register_with_handler(self):
         from repoze.bfg.configuration import Configurator
@@ -877,19 +877,19 @@ class TestUtilityDirective(unittest.TestCase):
         self.assertRaises(TypeError, self._callFUT, context, provides=None)
         
     def test_provides_from_factory_implements(self):
-        from repoze.bfg.configuration import Configurator
+        from repoze.bfg.registry import Registry
         context = DummyContext()
         self._callFUT(context, factory=DummyFactory)
         self.assertEqual(len(context.actions), 1)
         utility = context.actions[0]
         self.assertEqual(utility['discriminator'], ('utility', IFactory, ''))
         self.assertEqual(utility['callable'].im_func,
-                         Configurator.add_utility.im_func)
-        self.assertEqual(utility['args'],
-                         (None, IFactory, '', None, DummyFactory))
+                         Registry.registerUtility.im_func)
+        self.assertEqual(utility['args'], (None, IFactory, '', None))
+        self.assertEqual(utility['kw'], {'factory':DummyFactory})
 
     def test_provides_from_component_provides(self):
-        from repoze.bfg.configuration import Configurator
+        from repoze.bfg.registry import Registry
         context = DummyContext()
         component = DummyFactory()
         self._callFUT(context, component=component)
@@ -897,9 +897,9 @@ class TestUtilityDirective(unittest.TestCase):
         utility = context.actions[0]
         self.assertEqual(utility['discriminator'], ('utility', IFactory, ''))
         self.assertEqual(utility['callable'].im_func,
-                         Configurator.add_utility.im_func)
-        self.assertEqual(utility['args'],
-                         (component, IFactory, '', None, None))
+                         Registry.registerUtility.im_func)
+        self.assertEqual(utility['args'], (component, IFactory, '', None))
+        self.assertEqual(utility['kw'], {})
 
 class TestLoadZCML(unittest.TestCase):
     def setUp(self):