merged branch ManuelKiessling/ticket_3139 (PR symfony#3140)

fabpot · fabpot · commit 3d72fae38e50 · 2012-01-17T22:31:20.000+01:00
Commits ------- a1317c3 [Locale][Testing] Fixed breaking tests if 'intl' extension is not installed (symfony#3139) Discussion ---------- [Locale][Testing] Fixed breaking tests if 'intl' extension is not installed (symfony#3139) Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: ![Build Status](https://secure.travis-ci.org/ManuelKiessling/symfony.png?branch=ticket_3139) Fixes the following tickets: symfony#3139 Todo: - Symfony\Tests\Component\Locale\LocaleTest->testGetDisplayCountriesReturnsFullListForSubLocale() fails with a fatal error if the PHP extension 'intl' is not installed on the system. Added a check which skips the affected tests if the extension is not available. Fixes symfony#3139
diff --git a/tests/Symfony/Tests/Component/Locale/LocaleTest.php b/tests/Symfony/Tests/Component/Locale/LocaleTest.php
@@ -11,12 +11,16 @@
 
 namespace Symfony\Tests\Component\Locale;
 
+require_once __DIR__.'/TestCase.php';
+
 use Symfony\Component\Locale\Locale;
+use Symfony\Tests\Component\Locale\TestCase as LocaleTestCase;
 
-class LocaleTest extends \PHPUnit_Framework_TestCase
+class LocaleTest extends LocaleTestCase
 {
     public function testGetDisplayCountriesReturnsFullListForSubLocale()
     {
+        $this->skipIfIntlExtensionIsNotLoaded();
         $countriesDe = Locale::getDisplayCountries('de');
         $countriesDeCh = Locale::getDisplayCountries('de_CH');
 
@@ -27,6 +31,7 @@ public function testGetDisplayCountriesReturnsFullListForSubLocale()
 
     public function testGetDisplayLanguagesReturnsFullListForSubLocale()
     {
+        $this->skipIfIntlExtensionIsNotLoaded();
         $languagesDe = Locale::getDisplayLanguages('de');
         $languagesDeCh = Locale::getDisplayLanguages('de_CH');
 
@@ -37,6 +42,7 @@ public function testGetDisplayLanguagesReturnsFullListForSubLocale()
 
     public function testGetDisplayLocalesReturnsFullListForSubLocale()
     {
+        $this->skipIfIntlExtensionIsNotLoaded();
         $localesDe = Locale::getDisplayLocales('de');
         $localesDeCh = Locale::getDisplayLocales('de_CH');
 

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,16 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Tests\Component\Locale;`
`13`	`13`
	`14`	`+require_once __DIR__.'/TestCase.php';`
	`15`	`+`
`14`	`16`	`use Symfony\Component\Locale\Locale;`
	`17`	`+use Symfony\Tests\Component\Locale\TestCase as LocaleTestCase;`
`15`	`18`
`16`		`-class LocaleTest extends \PHPUnit_Framework_TestCase`
	`19`	`+class LocaleTest extends LocaleTestCase`
`17`	`20`	`{`
`18`	`21`	`public function testGetDisplayCountriesReturnsFullListForSubLocale()`
`19`	`22`	`{`
	`23`	`+ $this->skipIfIntlExtensionIsNotLoaded();`
`20`	`24`	`$countriesDe = Locale::getDisplayCountries('de');`
`21`	`25`	`$countriesDeCh = Locale::getDisplayCountries('de_CH');`
`22`	`26`
`@@ -27,6 +31,7 @@ public function testGetDisplayCountriesReturnsFullListForSubLocale()`
`27`	`31`
`28`	`32`	`public function testGetDisplayLanguagesReturnsFullListForSubLocale()`
`29`	`33`	`{`
	`34`	`+ $this->skipIfIntlExtensionIsNotLoaded();`
`30`	`35`	`$languagesDe = Locale::getDisplayLanguages('de');`
`31`	`36`	`$languagesDeCh = Locale::getDisplayLanguages('de_CH');`
`32`	`37`
`@@ -37,6 +42,7 @@ public function testGetDisplayLanguagesReturnsFullListForSubLocale()`
`37`	`42`
`38`	`43`	`public function testGetDisplayLocalesReturnsFullListForSubLocale()`
`39`	`44`	`{`
	`45`	`+ $this->skipIfIntlExtensionIsNotLoaded();`
`40`	`46`	`$localesDe = Locale::getDisplayLocales('de');`
`41`	`47`	`$localesDeCh = Locale::getDisplayLocales('de_CH');`
`42`	`48`