Merge branch '2.0' into 2.1
* 2.0: [Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8
This commit is contained in:
commit
3d6ca62744
@ -96,6 +96,10 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
|
||||
|
||||
public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
|
||||
{
|
||||
if ($this->isLowerThanIcuVersion('4.5')) {
|
||||
$this->markTestSkipped('Please upgrade ICU version to 4.5+');
|
||||
}
|
||||
|
||||
\Locale::setDefault('fr');
|
||||
$transformer = new NumberToLocalizedStringTransformer(null, true);
|
||||
|
||||
@ -113,6 +117,10 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
|
||||
*/
|
||||
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
|
||||
{
|
||||
if ($this->isLowerThanIcuVersion('4.5')) {
|
||||
$this->markTestSkipped('Please upgrade ICU version to 4.5+');
|
||||
}
|
||||
|
||||
$transformer = new NumberToLocalizedStringTransformer(null, true);
|
||||
|
||||
$transformer->reverseTransform('1.234.5');
|
||||
@ -123,6 +131,10 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
|
||||
*/
|
||||
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot_noGroupSep()
|
||||
{
|
||||
if ($this->isLowerThanIcuVersion('4.5')) {
|
||||
$this->markTestSkipped('Please upgrade ICU version to 4.5+');
|
||||
}
|
||||
|
||||
$transformer = new NumberToLocalizedStringTransformer(null, true);
|
||||
|
||||
$transformer->reverseTransform('1234.5');
|
||||
@ -139,6 +151,10 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
|
||||
|
||||
public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
|
||||
{
|
||||
if ($this->isLowerThanIcuVersion('4.5')) {
|
||||
$this->markTestSkipped('Please upgrade ICU version to 4.5+');
|
||||
}
|
||||
|
||||
\Locale::setDefault('ak');
|
||||
$transformer = new NumberToLocalizedStringTransformer(null, true);
|
||||
|
||||
@ -156,6 +172,10 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
|
||||
*/
|
||||
public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
|
||||
{
|
||||
if ($this->isLowerThanIcuVersion('4.5')) {
|
||||
$this->markTestSkipped('Please upgrade ICU version to 4.5+');
|
||||
}
|
||||
|
||||
\Locale::setDefault('en');
|
||||
$transformer = new NumberToLocalizedStringTransformer(null, true);
|
||||
|
||||
@ -167,6 +187,10 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
|
||||
*/
|
||||
public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma_noGroupSep()
|
||||
{
|
||||
if ($this->isLowerThanIcuVersion('4.5')) {
|
||||
$this->markTestSkipped('Please upgrade ICU version to 4.5+');
|
||||
}
|
||||
|
||||
\Locale::setDefault('en');
|
||||
$transformer = new NumberToLocalizedStringTransformer(null, true);
|
||||
|
||||
|
Reference in New Issue
Block a user