merged branch aboks/yaml_inlinetest (PR symfony#2602)

fabpot · fabpot · commit f8164ec380fa · 2011-11-10T13:05:03.000+01:00
Commits ------- e7acb23 [Yaml][Tests] Fixed missing locale string for Windows platforms which caused test to fail Discussion ---------- [Yaml][Tests] Fixed missing locale string for Windows platforms Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - On Windows all the locale formats supplied in the test do not work, causing the test to fail. The added locale string works correctly on (at least) Windows 7.
diff --git a/tests/Symfony/Tests/Component/Yaml/InlineTest.php b/tests/Symfony/Tests/Component/Yaml/InlineTest.php
@@ -47,10 +47,10 @@ public function testDumpNumericValueWithLocale()
             $this->markTestSkipped('Your platform does not support locales.');
         }
 
-        setlocale(LC_ALL, 'fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8');
+        setlocale(LC_ALL, 'fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252');
 
         $this->assertEquals('1.2', Inline::dump(1.2));
-        $this->assertContains('fr', setlocale(LC_NUMERIC, 0));
+        $this->assertContains('fr', strtolower(setlocale(LC_NUMERIC, 0)));
 
         setlocale(LC_ALL, $locale);
     }

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,10 @@ public function testDumpNumericValueWithLocale()`
`47`	`47`	`$this->markTestSkipped('Your platform does not support locales.');`
`48`	`48`	`}`
`49`	`49`
`50`		`- setlocale(LC_ALL, 'fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8');`
	`50`	`+ setlocale(LC_ALL, 'fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252');`
`51`	`51`
`52`	`52`	`$this->assertEquals('1.2', Inline::dump(1.2));`
`53`		`- $this->assertContains('fr', setlocale(LC_NUMERIC, 0));`
	`53`	`+ $this->assertContains('fr', strtolower(setlocale(LC_NUMERIC, 0)));`
`54`	`54`
`55`	`55`	`setlocale(LC_ALL, $locale);`
`56`	`56`	`}`