minor #8423 Update LocaleTest.php (mikemeier)

fabpot · fabpot · commit a4d423e4cd57 · 2013-12-27T17:00:18.000+01:00
This PR was squashed before being merged into the 2.5-dev branch (closes #8423). Discussion ---------- Update LocaleTest.php de_CH locales does not fallback to de see #5314 Commits ------- 572126b Update LocaleTest.php
diff --git a/src/Symfony/Component/Locale/Tests/LocaleTest.php b/src/Symfony/Component/Locale/Tests/LocaleTest.php
@@ -34,10 +34,22 @@ public function testGetDisplayCountries()
         $this->assertEquals('Brazil', $countries['BR']);
     }
 
+    public function testGetDisplayCountriesForSwitzerland()
+    {
+        $countries = Locale::getDisplayCountries('de_CH');
+        $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->assertContains('CH', $countries);
     }
 
     public function testGetDisplayLanguages()
@@ -49,7 +61,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()
@@ -61,6 +73,6 @@ public function testGetDisplayLocales()
     public function testGetLocales()
     {
         $locales = Locale::getLocales();
-        $this->assertTrue(in_array('pt', $locales));
+        $this->assertContains('pt', $locales);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,22 @@ public function testGetDisplayCountries()`
`34`	`34`	`$this->assertEquals('Brazil', $countries['BR']);`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ public function testGetDisplayCountriesForSwitzerland()`
	`38`	`+ {`
	`39`	`+ $countries = Locale::getDisplayCountries('de_CH');`
	`40`	`+ $this->assertEquals('Schweiz', $countries['CH']);`
	`41`	`+ }`
	`42`	`+`
`37`	`43`	`public function testGetCountries()`
`38`	`44`	`{`
`39`	`45`	`$countries = Locale::getCountries();`
`40`		`- $this->assertTrue(in_array('BR', $countries));`
	`46`	`+ $this->assertContains('BR', $countries);`
	`47`	`+ }`
	`48`	`+`
	`49`	`+ public function testGetCountriesForSwitzerland()`
	`50`	`+ {`
	`51`	`+ $countries = Locale::getCountries();`
	`52`	`+ $this->assertContains('CH', $countries);`
`41`	`53`	`}`
`42`	`54`
`43`	`55`	`public function testGetDisplayLanguages()`
`@@ -49,7 +61,7 @@ public function testGetDisplayLanguages()`
`49`	`61`	`public function testGetLanguages()`
`50`	`62`	`{`
`51`	`63`	`$languages = Locale::getLanguages();`
`52`		`- $this->assertTrue(in_array('pt_BR', $languages));`
	`64`	`+ $this->assertContains('pt_BR', $languages);`
`53`	`65`	`}`
`54`	`66`
`55`	`67`	`public function testGetDisplayLocales()`
`@@ -61,6 +73,6 @@ public function testGetDisplayLocales()`
`61`	`73`	`public function testGetLocales()`
`62`	`74`	`{`
`63`	`75`	`$locales = Locale::getLocales();`
`64`		`- $this->assertTrue(in_array('pt', $locales));`
	`76`	`+ $this->assertContains('pt', $locales);`
`65`	`77`	`}`
`66`	`78`	`}`