merged branch conf/test-fixes-for-ci.qa.php.net-2.0 (PR symfony#2750)

fabpot · fabpot · commit 416b70d5b2d7 · 2011-12-01T08:33:56.000+01:00
Commits ------- c1a798e Another style fix. eba9de1 Code style fix. 0b1abb3 1. Separated testing diacritic letters with additional check for mbstring in Symfony\Tests\Component\Console\Helper\FormatterHelperTest.php. 2. Added check if French locale was correctly set, skip the test otherwise in Symfony\Tests\Component\Yaml\InlineTest.php. 3. Inverted check for Windows platform since testing finding php with suffixes has meaning only in Windows in Symfony\Tests\Component\Process\PhpExecutableFinderTest.php. Discussion ---------- Test fixes for ci.qa.php.net 2.0 This is remake of symfony#2749 against 2.0 as requested by stof. Code style fix also applied. Original message below: My name is Shein Alexey and I'm writing on behalf of php-qa team. As you probably know we've set up build server for testing major php versions (5.3, 5.4 and trunk for now) on the url http://ci.qa.php.net. There's also an initiative also check these versions against major php projects with good test coverage like symfony. In our symfony builds some tests constantly fail (see http://ci.qa.php.net/view/php-userland/job/php-symfony2/420/testReport/ for example) so here are the fixes I come up with: Separated testing diacritic letters with additional check for mbstring in Symfony\Tests\Component\Console\Helper\FormatterHelperT Added check if French locale was correctly set, skip the test otherwise in Symfony\Tests\Component\Yaml\InlineTest.php. Inverted check for Windows platform since testing finding php with suffixes has meaning only in Windows in Symfony\Tests\Component\Process\PhpExecutableFinderTest.php. There is also erratic test Symfony\Tests\Component\HttpKernel\HttpCache\HttpCacheTest:testFetchesFullResponseWhenCacheStaleAndNoValidatorsPresent which randomly fails when Age header is non-zero, I'm not sure what to do here, maybe this check should be deleted since page can have age greater than zero. Let me know what you think. Thank you.
diff --git a/tests/Symfony/Tests/Component/Console/Helper/FormatterHelperTest.php b/tests/Symfony/Tests/Component/Console/Helper/FormatterHelperTest.php
@@ -50,6 +50,15 @@ public function testFormatBlock()
             $formatter->formatBlock('Some text to display', 'error', true),
             '::formatBlock() formats a message in a block'
         );
+    }
+
+    public function testFormatBlockWithDiacriticLetters()
+    {
+        if (!extension_loaded('mbstring')) {
+            $this->markTestSkipped('This test requires mbstring to work.');
+        }
+
+        $formatter = new FormatterHelper();
 
         $this->assertEquals(
             '<error>                       </error>' . "\n" .
diff --git a/tests/Symfony/Tests/Component/Process/PhpExecutableFinderTest.php b/tests/Symfony/Tests/Component/Process/PhpExecutableFinderTest.php
@@ -48,7 +48,7 @@ public function testFindWithSuffix()
         $current = $f->find();
 
         //TODO maybe php executable is custom or even windows
-        if (false === strstr(PHP_OS, 'WIN')) {
+        if (false !== strstr(PHP_OS, 'WIN')) {
             $this->assertEquals($current, PHP_BINDIR.DIRECTORY_SEPARATOR.'php', '::find() returns the executable php with suffixes');
         }
     }
diff --git a/tests/Symfony/Tests/Component/Yaml/InlineTest.php b/tests/Symfony/Tests/Component/Yaml/InlineTest.php
@@ -47,7 +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', 'French_France.1252');
+        $required_locales = array('fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252');
+        if (false === setlocale(LC_ALL, $required_locales)) {
+            $this->markTestSkipped('Could not set any of required locales: ' . implode(", ", $required_locales));
+        }
 
         $this->assertEquals('1.2', Inline::dump(1.2));
         $this->assertContains('fr', strtolower(setlocale(LC_NUMERIC, 0)));

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function testFindWithSuffix()`
`48`	`48`	`$current = $f->find();`
`49`	`49`
`50`	`50`	`//TODO maybe php executable is custom or even windows`
`51`		`- if (false === strstr(PHP_OS, 'WIN')) {`
	`51`	`+ if (false !== strstr(PHP_OS, 'WIN')) {`
`52`	`52`	`$this->assertEquals($current, PHP_BINDIR.DIRECTORY_SEPARATOR.'php', '::find() returns the executable php with suffixes');`
`53`	`53`	`}`
`54`	`54`	`}`