From 8ea211771c0793ee1a0af3780b0ba7977aa2d86d Mon Sep 17 00:00:00 2001 From: SilverFire - Dmitry Naumenko Date: Sun, 27 Nov 2016 12:17:28 +0200 Subject: [PATCH] Skip FormatConverterTest::testPHPDefaultFormat on HHVM. --- tests/framework/helpers/FormatConverterTest.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/framework/helpers/FormatConverterTest.php b/tests/framework/helpers/FormatConverterTest.php index 3f6efd3..e3d47a9 100644 --- a/tests/framework/helpers/FormatConverterTest.php +++ b/tests/framework/helpers/FormatConverterTest.php @@ -40,6 +40,11 @@ class FormatConverterTest extends TestCase */ public function testPHPDefaultFormat() { + + if (defined('HHVM_VERSION')) { + $this->markTestSkipped('Can not test on HHVM because HHVM returns inconsistend with PHP date format patterns.'); + } + foreach (FormatConverter::$phpFallbackDatePatterns as $format => $formats) { foreach ($formats as $name => $expected) { $expected = FormatConverter::convertDatePhpToIcu($expected); @@ -81,13 +86,7 @@ class FormatConverterTest extends TestCase break; } - $pattern = $fmt->getPattern(); - - if (defined('HHVM_VERSION') && $format === 'short') { - $pattern = str_replace(',', '', $pattern); // Remove comma between date and time ('M/d/yy, h:mm a') - } - - $this->assertEquals($expected, $pattern, "Format for $format $name does not match."); + $this->assertEquals($expected, $fmt->getPattern(), "Format for $format $name does not match."); } } }