From 51981a128c7ed05e51938a3f358c0970dcc33a6f Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 21 Apr 2010 10:35:07 +0000 Subject: Moved i18n work to a branch and revert to pre-i18n-feature state via svn merge -r9054:9030 svn+ssh://repoze@svn.repoze.org/svn/repoze.bfg/trunk --- repoze/bfg/tests/test_chameleon_text.py | 20 --- repoze/bfg/tests/test_chameleon_zpt.py | 20 --- repoze/bfg/tests/test_configuration.py | 21 --- repoze/bfg/tests/test_i18n.py | 219 -------------------------------- 4 files changed, 280 deletions(-) delete mode 100644 repoze/bfg/tests/test_i18n.py (limited to 'repoze/bfg/tests') diff --git a/repoze/bfg/tests/test_chameleon_text.py b/repoze/bfg/tests/test_chameleon_text.py index 204805adb..007c102e3 100644 --- a/repoze/bfg/tests/test_chameleon_text.py +++ b/repoze/bfg/tests/test_chameleon_text.py @@ -28,16 +28,6 @@ class Base: class TextTemplateRendererTests(Base, unittest.TestCase): - def setUp(self): - from repoze.bfg.configuration import Configurator - from repoze.bfg.registry import Registry - registry = Registry() - self.config = Configurator(registry=registry) - self.config.begin() - - def tearDown(self): - self.config.end() - def _getTargetClass(self): from repoze.bfg.chameleon_text import TextTemplateRenderer return TextTemplateRenderer @@ -64,16 +54,6 @@ class TextTemplateRendererTests(Base, unittest.TestCase): template = instance.template self.assertEqual(template, instance.__dict__['template']) - def test_template_with_ichameleon_translate(self): - from repoze.bfg.interfaces import IChameleonTranslate - def ct(): pass - self.config.registry.registerUtility(ct, IChameleonTranslate) - minimal = self._getTemplatePath('minimal.txt') - instance = self._makeOne(minimal) - self.failIf('template' in instance.__dict__) - template = instance.template - self.assertEqual(template.translate, ct) - def test_call(self): minimal = self._getTemplatePath('minimal.txt') instance = self._makeOne(minimal) diff --git a/repoze/bfg/tests/test_chameleon_zpt.py b/repoze/bfg/tests/test_chameleon_zpt.py index cbf9dd10b..e4bf8f766 100644 --- a/repoze/bfg/tests/test_chameleon_zpt.py +++ b/repoze/bfg/tests/test_chameleon_zpt.py @@ -21,16 +21,6 @@ class Base(object): return reg class ZPTTemplateRendererTests(Base, unittest.TestCase): - def setUp(self): - from repoze.bfg.configuration import Configurator - from repoze.bfg.registry import Registry - registry = Registry() - self.config = Configurator(registry=registry) - self.config.begin() - - def tearDown(self): - self.config.end() - def _getTargetClass(self): from repoze.bfg.chameleon_zpt import ZPTTemplateRenderer return ZPTTemplateRenderer @@ -65,16 +55,6 @@ class ZPTTemplateRendererTests(Base, unittest.TestCase): template = instance.template self.assertEqual(template, instance.__dict__['template']) - def test_template_with_ichameleon_translate(self): - from repoze.bfg.interfaces import IChameleonTranslate - def ct(): pass - self.config.registry.registerUtility(ct, IChameleonTranslate) - minimal = self._getTemplatePath('minimal.pt') - instance = self._makeOne(minimal) - self.failIf('template' in instance.__dict__) - template = instance.template - self.assertEqual(template.translate, ct) - def test_call_with_nondict_value(self): minimal = self._getTemplatePath('minimal.pt') instance = self._makeOne(minimal) diff --git a/repoze/bfg/tests/test_configuration.py b/repoze/bfg/tests/test_configuration.py index efd58139f..99d564b91 100644 --- a/repoze/bfg/tests/test_configuration.py +++ b/repoze/bfg/tests/test_configuration.py @@ -265,15 +265,6 @@ class ConfiguratorTests(unittest.TestCase): self.assertEqual(reg.getUtility(IRendererFactory, 'yeah'), renderer) - def test_setup_registry_translator_factory(self): - from repoze.bfg.registry import Registry - from repoze.bfg.interfaces import ITranslatorFactory - factory = object() - reg = Registry() - config = self._makeOne(reg) - config.setup_registry(translator_factory=factory) - self.assertEqual(reg.getUtility(ITranslatorFactory), factory) - def test_add_settings_settings_already_registered(self): from repoze.bfg.registry import Registry from repoze.bfg.interfaces import ISettings @@ -1736,18 +1727,6 @@ class ConfiguratorTests(unittest.TestCase): request = self._makeRequest(config) self.assertEqual(wrapped(None, request).__class__, StaticURLParser) - def test_set_translator_factory(self): - from repoze.bfg.interfaces import ITranslatorFactory - from repoze.bfg.interfaces import IChameleonTranslate - def factory(): pass - config = self._makeOne() - config.set_translator_factory(factory) - self.assertEqual(config.registry.getUtility(ITranslatorFactory), - factory) - self.assertEqual( - config.registry.getUtility(IChameleonTranslate).translator_factory, - factory) - def test_set_notfound_view(self): from zope.interface import implementedBy from repoze.bfg.interfaces import IRequest diff --git a/repoze/bfg/tests/test_i18n.py b/repoze/bfg/tests/test_i18n.py deleted file mode 100644 index 7d17b4551..000000000 --- a/repoze/bfg/tests/test_i18n.py +++ /dev/null @@ -1,219 +0,0 @@ -import unittest - -class TestTranslationString(unittest.TestCase): - def _makeOne(self, text, **kw): - from repoze.bfg.i18n import TranslationString - return TranslationString(text, **kw) - - def test_msgid_None(self): - inst = self._makeOne('text') - self.assertEqual(inst, 'text') - self.assertEqual(inst.default, 'text') - - def test_msgid_not_None(self): - inst = self._makeOne('text', msgid='msgid') - self.assertEqual(inst, 'msgid') - self.assertEqual(inst.default, 'text') - - def test_allargs(self): - inst = self._makeOne('text', msgid='msgid', mapping='mapping', - domain='domain') - self.assertEqual(inst, 'msgid') - self.assertEqual(inst.default, 'text') - self.assertEqual(inst.mapping, 'mapping') - self.assertEqual(inst.domain, 'domain') - -class TestTranslationStringFactory(unittest.TestCase): - def _makeOne(self, domain): - from repoze.bfg.i18n import TranslationStringFactory - return TranslationStringFactory(domain) - - def test_allargs(self): - factory = self._makeOne('budge') - inst = factory('text', mapping='mapping', msgid='msgid') - self.assertEqual(inst, 'msgid') - self.assertEqual(inst.domain, 'budge') - self.assertEqual(inst.mapping, 'mapping') - self.assertEqual(inst.default, 'text') - -class Test_bfg_tstr(unittest.TestCase): - def _callFUT(self, text, **kw): - from repoze.bfg.i18n import bfg_tstr - return bfg_tstr(text, **kw) - - def test_allargs(self): - inst = self._callFUT('text', mapping='mapping', msgid='msgid') - self.assertEqual(inst, 'msgid') - self.assertEqual(inst.domain, 'bfg') - self.assertEqual(inst.mapping, 'mapping') - self.assertEqual(inst.default, 'text') - -class Test_get_translator(unittest.TestCase): - def _callFUT(self, request): - from repoze.bfg.i18n import get_translator - return get_translator(request) - - def test_no_ITranslatorFactory(self): - from repoze.bfg.i18n import InterpolationOnlyTranslator - request = DummyRequest() - request.registry = DummyRegistry() - translator = self._callFUT(request) - self.assertEqual(translator.__class__, InterpolationOnlyTranslator) - - def test_no_registry_on_request(self): - from repoze.bfg.i18n import InterpolationOnlyTranslator - request = DummyRequest() - translator = self._callFUT(request) - self.assertEqual(translator.__class__, InterpolationOnlyTranslator) - - def test_with_ITranslatorFactory_from_registry(self): - request = DummyRequest() - tfactory = DummyTranslatorFactory() - request.registry = DummyRegistry(tfactory) - translator = self._callFUT(request) - self.assertEqual(translator.request, request) - - def test_with_ITranslatorFactory_from_request_cache(self): - request = DummyRequest() - request.registry = DummyRegistry() - request._bfg_translator = 'abc' - translator = self._callFUT(request) - self.assertEqual(translator, 'abc') - -class TestInterpolationOnlyTranslator(unittest.TestCase): - def _makeOne(self, request): - from repoze.bfg.i18n import InterpolationOnlyTranslator - return InterpolationOnlyTranslator(request) - - def test_it(self): - message = DummyMessage('text ${a}', mapping={'a':'1'}) - translator = self._makeOne(None) - result = translator(message) - self.assertEqual(result, u'text 1') - -class TestChameleonTranslate(unittest.TestCase): - def setUp(self): - request = DummyRequest() - from repoze.bfg.configuration import Configurator - self.config = Configurator() - self.config.begin(request=request) - self.request = request - - def tearDown(self): - self.config.end() - - def _makeOne(self, factory): - from repoze.bfg.i18n import ChameleonTranslate - return ChameleonTranslate(factory) - - def test_text_None(self): - trans = self._makeOne(None) - result = trans(None) - self.assertEqual(result, None) - - def test_no_current_request(self): - self.config.manager.pop() - trans = self._makeOne(None) - result = trans('text') - self.assertEqual(result, 'text') - - def test_with_current_request_no_translator(self): - trans = self._makeOne(None) - result = trans('text') - self.assertEqual(result, 'text') - - def test_with_current_request_and_translator(self): - from repoze.bfg.interfaces import ITranslatorFactory - translator = DummyTranslator() - factory = DummyTranslatorFactory(translator) - self.config.registry.registerUtility(factory, ITranslatorFactory) - trans = self._makeOne(None) - result = trans('text') - self.assertEqual(result, 'text') - self.assertEqual(result.domain, None) - self.assertEqual(result.default, 'text') - self.assertEqual(result.mapping, {}) - - def test_with_allargs(self): - from repoze.bfg.interfaces import ITranslatorFactory - translator = DummyTranslator() - factory = DummyTranslatorFactory(translator) - self.config.registry.registerUtility(factory, ITranslatorFactory) - trans = self._makeOne(None) - result = trans('text', domain='domain', mapping={'a':'1'}, - context=None, target_language='lang', - default='default') - self.assertEqual(result, 'text') - self.assertEqual(result.domain, 'domain') - self.assertEqual(result.default, 'default') - self.assertEqual(result.mapping, {'a':'1'}) - -class Test_interpolate(unittest.TestCase): - def _callFUT(self, text, mapping=None): - from repoze.bfg.i18n import interpolate - return interpolate(text, mapping) - - def test_substitution(self): - mapping = {"name": "Zope", "version": 3} - result = self._callFUT(u"This is $name version ${version}.", mapping) - self.assertEqual(result, u'This is Zope version 3.') - - def test_subsitution_more_than_once(self): - mapping = {"name": "Zope", "version": 3} - result = self._callFUT( - u"This is $name version ${version}. ${name} $version!", - mapping) - self.assertEqual(result, u'This is Zope version 3. Zope 3!') - - def test_double_dollar_escape(self): - mapping = {"name": "Zope", "version": 3} - result = self._callFUT('$$name', mapping) - self.assertEqual(result, u'$$name') - - def test_missing_not_interpolated(self): - mapping = {"name": "Zope", "version": 3} - result = self._callFUT( - u"This is $name $version. $unknown $$name $${version}.", - mapping) - self.assertEqual(result, - u'This is Zope 3. $unknown $$name $${version}.') - - def test_missing_mapping(self): - result = self._callFUT(u"This is ${name}") - self.assertEqual(result, u'This is ${name}') - -class DummyMessage(unicode): - def __new__(cls, text, msgid=None, domain=None, mapping=None): - self = unicode.__new__(cls, text) - if msgid is None: - msgid = unicode(text) - self.msgid = msgid - self.domain = domain - self.mapping = mapping or {} - return self - -class DummyRequest(object): - pass - -class DummyRegistry(object): - def __init__(self, tfactory=None): - self.tfactory = tfactory - - def queryUtility(self, iface, default=None): - return self.tfactory or default - -class DummyTranslator(object): - def __call__(self, message): - return message - -class DummyTranslatorFactory(object): - def __init__(self, translator=None): - self.translator = translator - - def __call__(self, request): - self.request = request - if self.translator is None: - return self - return self.translator - - -- cgit v1.2.3