From 890355b314e8606566d096f1c5d3471add3b79fe Mon Sep 17 00:00:00 2001 From: Mike Meier Date: Fri, 5 Jul 2013 00:03:47 +0200 Subject: [PATCH 1/2] Update LocaleTest.php de_CH locales does not fallback to de see https://github.com/symfony/symfony/issues/5314 --- src/Symfony/Component/Locale/Tests/LocaleTest.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/Symfony/Component/Locale/Tests/LocaleTest.php b/src/Symfony/Component/Locale/Tests/LocaleTest.php index d11c826c48220..31c7301528dab 100644 --- a/src/Symfony/Component/Locale/Tests/LocaleTest.php +++ b/src/Symfony/Component/Locale/Tests/LocaleTest.php @@ -35,12 +35,25 @@ public function testGetDisplayCountries() $this->assertEquals('Brazil', $countries['BR']); } + public function testGetDisplayCountriesForSwitzerland() + { + $countries = Locale::getDisplayCountries('de_CH'); + $this->assertTrue(in_array('CH', $countries)); + $this->assertEquals('Schweiz', $countries['CH']); + } + public function testGetCountries() { $countries = Locale::getCountries(); $this->assertTrue(in_array('BR', $countries)); } + public function testGetCountriesForSwitzerland() + { + $countries = Locale::getCountries(); + $this->assertTrue(in_array('CH', $countries)); + } + public function testGetDisplayLanguages() { $languages = Locale::getDisplayLanguages('en'); From 432cf20f6312fcb281e3e6a2d8295f29e774ce31 Mon Sep 17 00:00:00 2001 From: Mike Meier Date: Fri, 5 Jul 2013 10:26:41 +0200 Subject: [PATCH 2/2] rewrite tests - using correct assert methods --- src/Symfony/Component/Locale/Tests/LocaleTest.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/Locale/Tests/LocaleTest.php b/src/Symfony/Component/Locale/Tests/LocaleTest.php index 31c7301528dab..44cbfcf406c0d 100644 --- a/src/Symfony/Component/Locale/Tests/LocaleTest.php +++ b/src/Symfony/Component/Locale/Tests/LocaleTest.php @@ -38,20 +38,19 @@ public function testGetDisplayCountries() public function testGetDisplayCountriesForSwitzerland() { $countries = Locale::getDisplayCountries('de_CH'); - $this->assertTrue(in_array('CH', $countries)); $this->assertEquals('Schweiz', $countries['CH']); } public function testGetCountries() { $countries = Locale::getCountries(); - $this->assertTrue(in_array('BR', $countries)); + $this->assertContains('BR', $countries); } public function testGetCountriesForSwitzerland() { $countries = Locale::getCountries(); - $this->assertTrue(in_array('CH', $countries)); + $this->assertContains('CH', $countries); } public function testGetDisplayLanguages() @@ -63,7 +62,7 @@ public function testGetDisplayLanguages() public function testGetLanguages() { $languages = Locale::getLanguages(); - $this->assertTrue(in_array('pt_BR', $languages)); + $this->assertContains('pt_BR', $languages); } public function testGetDisplayLocales() @@ -75,6 +74,6 @@ public function testGetDisplayLocales() public function testGetLocales() { $locales = Locale::getLocales(); - $this->assertTrue(in_array('pt', $locales)); + $this->assertContains('pt', $locales); } } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy