adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding I18n::clear() to remove most of the private variable access from the i18n test case.

Browse source 
Changing casing of classname in test case.
This commit is contained in:
mark_story 2010-09-21 21:13:45 -04:00
parent 2eac24c31a
commit ce1115b0b4
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cake/libs/i18n.php
View file

@ -193,6 +193,16 @@ class I18n extends Object {
return $singular; return $singular;
} }
/**
* Clears the domains internal data array. Useful for testing i18n.
*
* @return void
*/
function clear() {
$self =& I18n::getInstance();
$self->__domains = array();
}
/** /**
* Attempts to find the plural form of a string. * Attempts to find the plural form of a string.
* *

19
cake/tests/cases/libs/i18n.test.php
View file

@ -57,25 +57,23 @@ class I18nTest extends CakeTestCase {
function testTranslationCaching() { function testTranslationCaching() {
Configure::write('Config.language', 'cache_test_po'); Configure::write('Config.language', 'cache_test_po');
$i18n =& i18n::getInstance(); $i18n =& i18n::getInstance();
// reset internally stored entries // reset internally stored entries
$i18n->__cache = array(); I18n::clear();
$i18n->__domains = array();
Cache::clear(false, '_cake_core_'); Cache::clear(false, '_cake_core_');
$lang = Configure::read('Config.language');#$i18n->l10n->locale; $lang = Configure::read('Config.language');#$i18n->l10n->locale;
Cache::config('_cake_core_', Cache::config('default')); Cache::config('_cake_core_', Cache::config('default'));
// make some calls to translate using different domains // make some calls to translate using different domains
$this->assertEqual(i18n::translate('dom1.foo', false, 'dom1'), 'Dom 1 Foo'); $this->assertEqual(I18n::translate('dom1.foo', false, 'dom1'), 'Dom 1 Foo');
$this->assertEqual(i18n::translate('dom1.bar', false, 'dom1'), 'Dom 1 Bar'); $this->assertEqual(I18n::translate('dom1.bar', false, 'dom1'), 'Dom 1 Bar');
$this->assertEqual($i18n->__domains['dom1']['cache_test_po']['LC_MESSAGES']['dom1.foo'], 'Dom 1 Foo'); $this->assertEqual($i18n->__domains['dom1']['cache_test_po']['LC_MESSAGES']['dom1.foo'], 'Dom 1 Foo');
// reset internally stored entries // reset internally stored entries
$i18n->__domains = array(); I18n::clear();
$i18n->__cache = array();
// now only dom1 should be in cache // now only dom1 should be in cache
$cachedDom1 = Cache::read('dom1_' . $lang, '_cake_core_'); $cachedDom1 = Cache::read('dom1_' . $lang, '_cake_core_');
@ -85,7 +83,7 @@ class I18nTest extends CakeTestCase {
$this->assertFalse(Cache::read('dom2_' . $lang, '_cake_core_')); $this->assertFalse(Cache::read('dom2_' . $lang, '_cake_core_'));
// translate a item of dom2 (adds dom2 to cache) // translate a item of dom2 (adds dom2 to cache)
$this->assertEqual(i18n::translate('dom2.foo', false, 'dom2'), 'Dom 2 Foo'); $this->assertEqual(I18n::translate('dom2.foo', false, 'dom2'), 'Dom 2 Foo');
// verify dom2 was cached through manual read from cache // verify dom2 was cached through manual read from cache
$cachedDom2 = Cache::read('dom2_' . $lang, '_cake_core_'); $cachedDom2 = Cache::read('dom2_' . $lang, '_cake_core_');
@ -95,8 +93,7 @@ class I18nTest extends CakeTestCase {
// modify cache entry manually to verify that dom1 entries now will be read from cache // modify cache entry manually to verify that dom1 entries now will be read from cache
$cachedDom1['LC_MESSAGES']['dom1.foo'] = 'FOO'; $cachedDom1['LC_MESSAGES']['dom1.foo'] = 'FOO';
Cache::write('dom1_' . $lang, $cachedDom1, '_cake_core_'); Cache::write('dom1_' . $lang, $cachedDom1, '_cake_core_');
$this->assertEqual(i18n::translate('dom1.foo', false, 'dom1'), 'FOO'); $this->assertEqual(I18n::translate('dom1.foo', false, 'dom1'), 'FOO');
} }