Changeset 36788

Timestamp:

02/29/2016 10:37:42 PM (9 years ago)

Author:

boonebgorges

Message:

mbstring.func_overload test should be skipped properly.

This avoids PHPUnit notices related to "risky" tests.

See #36016.

File:

• trunk/tests/phpunit/tests/pomo/mo.php (modified) (1 diff)

trunk/tests/phpunit/tests/pomo/mo.php

@@ -128 +128 @@
 
     function test_overloaded_mb_functions() {
-        // skipIf() method skips the whole test case, not only this method
-        // that's why we are skipping it the stupid way
-        if ((ini_get("mbstring.func_overload") & 2) != 0) {
-            $mo = new MO();
-            $mo->import_from_file(DIR_TESTDATA . '/pomo/overload.mo');
-            $this->assertEquals(array('Табло'), $mo->entries['Dashboard']->translations);
+        if ((ini_get("mbstring.func_overload") & 2) == 0) {
+            $this->markTestSkipped( __METHOD__ . ' only runs when mbstring.func_overload is enabled.' );
         }
+
+        $mo = new MO();
+        $mo->import_from_file(DIR_TESTDATA . '/pomo/overload.mo');
+        $this->assertEquals(array('Табло'), $mo->entries['Dashboard']->translations);
     }