From 1dcdcd38cd137a232754d116d5233d07ba7e0147 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Fri, 15 Mar 2013 23:41:39 +0100 Subject: [PATCH] [Locale] Fixed failing tests --- src/Symfony/Component/Locale/Tests/LocaleTest.php | 5 ++++- src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Locale/Tests/LocaleTest.php b/src/Symfony/Component/Locale/Tests/LocaleTest.php index f568619573..71c5ba2da9 100644 --- a/src/Symfony/Component/Locale/Tests/LocaleTest.php +++ b/src/Symfony/Component/Locale/Tests/LocaleTest.php @@ -25,7 +25,10 @@ class LocaleTest extends IntlTestCase { protected function setUp() { - $this->skipIfIntlExtensionNotLoaded(); + // This class extends from \Ļocale, so we need the extension + if (!Intl::isExtensionLoaded()) { + $this->markTestSkipped('The intl extension is not available.'); + } Intl::setDataSource(Intl::STUB); diff --git a/src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php b/src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php index 2c60d9824b..aebd576838 100644 --- a/src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php +++ b/src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php @@ -28,7 +28,7 @@ class StubLocaleTest extends \PHPUnit_Framework_TestCase public function testGetCurrenciesData() { $currencies = StubLocale::getCurrenciesData('en'); - $this->assertEquals('BR$', $currencies['BRL']['symbol']); + $this->assertEquals('R$', $currencies['BRL']['symbol']); $this->assertEquals('Brazilian Real', $currencies['BRL']['name']); $this->assertEquals(2, $currencies['BRL']['fractionDigits']); $this->assertEquals(0, $currencies['BRL']['roundingIncrement']);