[Locale] Fixed failing tests

webmozart · webmozart · commit 1dcdcd38cd13 · 2013-04-05T10:11:16.000+02:00
diff --git 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
@@ -28,7 +28,7 @@ protected function setUp()
     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']);

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,10 @@ class LocaleTest extends IntlTestCase`
`25`	`25`	`{`
`26`	`26`	`protected function setUp()`
`27`	`27`	`{`
`28`		`- $this->skipIfIntlExtensionNotLoaded();`
	`28`	`+ // This class extends from \Ļocale, so we need the extension`
	`29`	`+ if (!Intl::isExtensionLoaded()) {`
	`30`	`+ $this->markTestSkipped('The intl extension is not available.');`
	`31`	`+ }`
`29`	`32`
`30`	`33`	`Intl::setDataSource(Intl::STUB);`
`31`	`34`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ protected function setUp()`
`28`	`28`	`public function testGetCurrenciesData()`
`29`	`29`	`{`
`30`	`30`	`$currencies = StubLocale::getCurrenciesData('en');`
`31`		`- $this->assertEquals('BR$', $currencies['BRL']['symbol']);`
	`31`	`+ $this->assertEquals('R$', $currencies['BRL']['symbol']);`
`32`	`32`	`$this->assertEquals('Brazilian Real', $currencies['BRL']['name']);`
`33`	`33`	`$this->assertEquals(2, $currencies['BRL']['fractionDigits']);`
`34`	`34`	`$this->assertEquals(0, $currencies['BRL']['roundingIncrement']);`