merged 2.0

symfony · Apr 20, 2012 · 52807f7 · 52807f7
2 parents a4d4995 + 3e0a191
commit 52807f7
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Tests/ParserTest.php b/Tests/ParserTest.php
@@ -32,8 +32,14 @@ protected function tearDown()
     /**
      * @dataProvider getDataFormSpecifications
      */
-    public function testSpecifications($expected, $yaml, $comment)
+    public function testSpecifications($file, $expected, $yaml, $comment)
     {
+        if ('escapedCharacters' == $file) {
+            if (!function_exists('iconv') && !function_exists('mb_convert_encoding')) {
+                $this->markTestSkipped('The iconv and mbstring extensions are not available.');
+            }
+        }
+
         $this->assertEquals($expected, var_export($this->parser->parse($yaml), true), $comment);
     }
 
@@ -59,7 +65,7 @@ public function getDataFormSpecifications()
                 } else {
                     $expected = var_export(eval('return '.trim($test['php']).';'), true);
 
-                    $tests[] = array($expected, $test['yaml'], $test['test']);
+                    $tests[] = array($file, $expected, $test['yaml'], $test['test']);
                 }
             }
         }