From c89bcbc3f040e2ab7770958abc01db1984bb958d Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 22 Sep 2009 03:33:53 +0000 Subject: __is_bfg_view__ -> __bfg_view_settings__ --- repoze/bfg/tests/test_integration.py | 2 +- repoze/bfg/tests/test_view.py | 24 ++++++++++++------------ repoze/bfg/tests/test_zcml.py | 20 ++++++-------------- 3 files changed, 19 insertions(+), 27 deletions(-) (limited to 'repoze/bfg/tests') diff --git a/repoze/bfg/tests/test_integration.py b/repoze/bfg/tests/test_integration.py index fb5d22a2b..5e386a069 100644 --- a/repoze/bfg/tests/test_integration.py +++ b/repoze/bfg/tests/test_integration.py @@ -27,7 +27,7 @@ class WGSIAppPlusBFGViewTests(unittest.TestCase): def test_it(self): import types - self.assertEqual(wsgiapptest.__is_bfg_view__, True) + self.failUnless(wsgiapptest.__bfg_view_settings__) self.failUnless(type(wsgiapptest) is types.FunctionType) context = DummyContext() request = DummyRequest() diff --git a/repoze/bfg/tests/test_view.py b/repoze/bfg/tests/test_view.py index 42d14f83a..e741c32f5 100644 --- a/repoze/bfg/tests/test_view.py +++ b/repoze/bfg/tests/test_view.py @@ -376,10 +376,10 @@ class TestBFGViewDecorator(unittest.TestCase): """ docstring """ wrapped = decorator(foo) self.failUnless(wrapped is foo) - self.assertEqual(wrapped.__is_bfg_view__, True) - self.assertEqual(wrapped.__permission__, None) - self.assertEqual(wrapped.__for__, None) - self.assertEqual(wrapped.__request_type__, None) + settings = wrapped.__bfg_view_settings__ + self.assertEqual(settings['permission'], None) + self.assertEqual(settings['for_'], None) + self.assertEqual(settings['request_type'], None) def test_call_oldstyle_class(self): decorator = self._makeOne() @@ -387,10 +387,10 @@ class TestBFGViewDecorator(unittest.TestCase): """ docstring """ wrapped = decorator(foo) self.failUnless(wrapped is foo) - self.assertEqual(wrapped.__is_bfg_view__, True) - self.assertEqual(wrapped.__permission__, None) - self.assertEqual(wrapped.__for__, None) - self.assertEqual(wrapped.__request_type__, None) + settings = wrapped.__bfg_view_settings__ + self.assertEqual(settings['permission'], None) + self.assertEqual(settings['for_'], None) + self.assertEqual(settings['request_type'], None) def test_call_newstyle_class(self): decorator = self._makeOne() @@ -398,10 +398,10 @@ class TestBFGViewDecorator(unittest.TestCase): """ docstring """ wrapped = decorator(foo) self.failUnless(wrapped is foo) - self.assertEqual(wrapped.__is_bfg_view__, True) - self.assertEqual(wrapped.__permission__, None) - self.assertEqual(wrapped.__for__, None) - self.assertEqual(wrapped.__request_type__, None) + settings = wrapped.__bfg_view_settings__ + self.assertEqual(settings['permission'], None) + self.assertEqual(settings['for_'], None) + self.assertEqual(settings['request_type'], None) class TestDefaultForbiddenView(unittest.TestCase): def _callFUT(self, context, request): diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py index 5be8b7fb2..d521250b5 100644 --- a/repoze/bfg/tests/test_zcml.py +++ b/repoze/bfg/tests/test_zcml.py @@ -1833,20 +1833,12 @@ class TestBFGViewGrokker(unittest.TestCase): pass def __call__(self): return 'OK' - obj.__is_bfg_view__ = True - obj.__permission__ = 'foo' - obj.__for__ = Interface - obj.__view_name__ = 'foo.html' - obj.__request_type__ = IRequest - obj.__route_name__ = None - obj.__request_method__ = None - obj.__request_param__ = None - obj.__containment__ = None - obj.__attr__ = None - obj.__template__ = None - obj.__wrapper_viewname__ = None - obj.__renderer__ = None - obj.__attr__ = None + settings = dict(permission='foo', for_=Interface, name='foo.html', + request_type=IRequest, route_name=None, + request_method=None, request_param=None, + containment=None, attr=None, renderer=None, + wrapper_viewname=None) + obj.__bfg_view_settings__ = settings context = DummyContext() result = grokker.grok('name', obj, context=context) self.assertEqual(result, True) -- cgit v1.2.3