Error202
/
yii2-swiftmailer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

improved unit tests for ICU message formatter

tags/2.0.0-beta
Carsten Brandt 12 years ago
parent
150b9366fc
commit
2eb5abbfcb
2 changed files with 87 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      framework/yii/i18n/MessageFormatter.php
  2. 137
      tests/unit/framework/i18n/MessageFormatterTest.php

5
framework/yii/i18n/MessageFormatter.php
Unescape View File

@ -15,6 +15,7 @@ namespace yii\i18n;
* substituted.
*
* @author Alexander Makarov <sam@rmcreative.ru>
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
*/
class MessageFormatter extends \MessageFormatter
@ -55,7 +56,7 @@ class MessageFormatter extends \MessageFormatter
}
/**
* Replace named placeholders with numeric placeholders.
* Replace named placeholders with numeric placeholders and quote unused.
*
* @param string $pattern The pattern string to replace things into.
* @param array $args The array of values to insert into the format string.
@ -65,7 +66,7 @@ class MessageFormatter extends \MessageFormatter
{
$map = array_flip(array_keys($args));
// parsing pattern base on ICU grammar:
// parsing pattern based on ICU grammar:
// http://icu-project.org/apiref/icu4c/classMessageFormat.html#details
$parts = explode('{', $pattern);
$c = count($parts);

137
tests/unit/framework/i18n/MessageFormatterTest.php
Unescape View File

@ -22,18 +22,19 @@ class MessageFormatterTest extends TestCase
const SUBJECT = 'сабж';
const SUBJECT_VALUE = 'Answer to the Ultimate Question of Life, the Universe, and Everything';
public function testNamedArguments()
public function patterns()
{
$expected = self::SUBJECT_VALUE.' is '.self::N_VALUE;
return array(
array(
'{'.self::SUBJECT.'} is {'.self::N.', number}', // pattern
self::SUBJECT_VALUE.' is '.self::N_VALUE, // expected
array( // params
self::N => self::N_VALUE,
self::SUBJECT => self::SUBJECT_VALUE,
)
),
$result = MessageFormatter::formatMessage('en_US', '{'.self::SUBJECT.'} is {'.self::N.', number}', array(
self::N => self::N_VALUE,
self::SUBJECT => self::SUBJECT_VALUE,
));
$this->assertEquals($expected, $result);
$pattern = <<<_MSG_
array(<<<_MSG_
{gender_of_host, select,
female {{num_guests, plural, offset:1
=0 {{host} does not give a party.}
@ -50,53 +51,83 @@ class MessageFormatterTest extends TestCase
=1 {{host} invites {guest} to their party.}
=2 {{host} invites {guest} and one other person to their party.}
other {{host} invites {guest} and # other people to their party.}}}}
_MSG_;
$result = MessageFormatter::formatMessage('en_US', $pattern, array(
'gender_of_host' => 'male',
'num_guests' => 4,
'host' => 'ralph',
'guest' => 'beep'
));
$this->assertEquals('ralph invites beep and 3 other people to his party.', $result);
_MSG_
,
'ralph invites beep and 3 other people to his party.',
array(
'gender_of_host' => 'male',
'num_guests' => 4,
'host' => 'ralph',
'guest' => 'beep'
)
),
$pattern = '{name} is {gender} and {gender, select, female{she} male{he} other{it}} loves Yii!';
$result = MessageFormatter::formatMessage('en_US', $pattern, array(
'name' => 'Alexander',
'gender' => 'male',
));
$this->assertEquals('Alexander is male and he loves Yii!', $result);
array(
'{name} is {gender} and {gender, select, female{she} male{he} other{it}} loves Yii!',
'Alexander is male and he loves Yii!',
array(
'name' => 'Alexander',
'gender' => 'male',
),
),
// verify pattern in select does not get replaced
$pattern = '{name} is {gender} and {gender, select, female{she} male{he} other{it}} loves Yii!';
$result = MessageFormatter::formatMessage('en_US', $pattern, array(
'name' => 'Alexander',
'gender' => 'male',
// following should not be replaced
'he' => 'wtf',
'she' => 'wtf',
'it' => 'wtf',
));
$this->assertEquals('Alexander is male and he loves Yii!', $result);
// verify pattern in select does not get replaced
array(
'{name} is {gender} and {gender, select, female{she} male{he} other{it}} loves Yii!',
'Alexander is male and he loves Yii!',
array(
'name' => 'Alexander',
'gender' => 'male',
// following should not be replaced
'he' => 'wtf',
'she' => 'wtf',
'it' => 'wtf',
)
),
// verify pattern in select message gets replaced
$pattern = '{name} is {gender} and {gender, select, female{she} male{{he}} other{it}} loves Yii!';
$result = MessageFormatter::formatMessage('en_US', $pattern, array(
'name' => 'Alexander',
'gender' => 'male',
'he' => 'wtf',
'she' => 'wtf',
));
$this->assertEquals('Alexander is male and wtf loves Yii!', $result);
// verify pattern in select message gets replaced
array(
'{name} is {gender} and {gender, select, female{she} male{{he}} other{it}} loves Yii!',
'Alexander is male and wtf loves Yii!',
array(
'name' => 'Alexander',
'gender' => 'male',
'he' => 'wtf',
'she' => 'wtf',
),
),
// some parser specific verifications
$pattern = '{gender} and {gender, select, female{she} male{{he}} other{it}} loves {nr, number} is {gender}!';
$result = MessageFormatter::formatMessage('en_US', $pattern, array(
'nr' => 42,
'gender' => 'male',
'he' => 'wtf',
'she' => 'wtf',
));
$this->assertEquals('male and wtf loves 42 is male!', $result);
// some parser specific verifications
array(
'{gender} and {gender, select, female{she} male{{he}} other{it}} loves {nr, number} is {gender}!',
'male and wtf loves 42 is male!',
array(
'nr' => 42,
'gender' => 'male',
'he' => 'wtf',
'she' => 'wtf',
),
),
);
}
/**
* @dataProvider patterns
*/
public function testNamedArgumentsStatic($pattern, $expected, $args)
{
$result = MessageFormatter::formatMessage('en_US', $pattern, $args);
$this->assertEquals($expected, $result);
}
/**
* @dataProvider patterns
*/
public function testNamedArgumentsObject($pattern, $expected, $args)
{
$formatter = new MessageFormatter('en_US', $pattern);
$result = $formatter->format($args);
$this->assertEquals($expected, $result);
}
public function testInsufficientArguments()

Write Preview
Loading…
Cancel
Save