[ci] Testing with UTC hides bugs

Author: nicolas-grekas

Tests/Collator/Verification/CollatorTest.php

@@ -24,7 +24,7 @@ class CollatorTest extends AbstractCollatorTest
 {
     protected function setUp()
     {
-        IntlTestHelper::requireFullIntl($this);
+        IntlTestHelper::requireFullIntl($this, false);
 
         parent::setUp();
     }

Tests/DateFormatter/AbstractIntlDateFormatterTest.php

@@ -908,9 +908,7 @@ protected function getDateTime($timestamp, $timeZone)
     {
         $dateTime = new \DateTime();
         $dateTime->setTimestamp(null === $timestamp ? time() : $timestamp);
-        if (null !== $timeZone) {
-            $dateTime->setTimezone(new \DateTimeZone($timeZone));
-        }
+        $dateTime->setTimezone(new \DateTimeZone($timeZone ?: getenv('TZ') ?: 'UTC'));
 
         return $dateTime;
     }

Tests/DateFormatter/Verification/IntlDateFormatterTest.php

@@ -25,7 +25,7 @@ class IntlDateFormatterTest extends AbstractIntlDateFormatterTest
 {
     protected function setUp()
     {
-        IntlTestHelper::requireFullIntl($this);
+        IntlTestHelper::requireFullIntl($this, false);
 
         parent::setUp();
     }
@@ -45,6 +45,8 @@ public function testFormatWithTimezoneFromEnvironmentVariable()
 
     protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null)
     {
+        IntlTestHelper::requireFullIntl($this, '55.1');
+
         if (!$formatter = new \IntlDateFormatter($locale, $datetype, $timetype, $timezone, $calendar, $pattern)) {
             throw new \InvalidArgumentException(intl_get_error_message());
         }

Tests/Globals/Verification/IntlGlobalsTest.php

@@ -24,7 +24,7 @@ class IntlGlobalsTest extends AbstractIntlGlobalsTest
 {
     protected function setUp()
     {
-        IntlTestHelper::requireFullIntl($this);
+        IntlTestHelper::requireFullIntl($this, false);
 
         parent::setUp();
     }

Tests/Locale/Verification/LocaleTest.php

@@ -24,7 +24,7 @@ class LocaleTest extends AbstractLocaleTest
 {
     protected function setUp()
     {
-        IntlTestHelper::requireFullIntl($this);
+        IntlTestHelper::requireFullIntl($this, false);
 
         parent::setUp();
     }

Tests/NumberFormatter/Verification/NumberFormatterTest.php

@@ -22,7 +22,7 @@ class NumberFormatterTest extends AbstractNumberFormatterTest
 {
     protected function setUp()
     {
-        IntlTestHelper::requireFullIntl($this);
+        IntlTestHelper::requireFullIntl($this, '55.1');
 
         parent::setUp();
     }
@@ -32,6 +32,13 @@ public function testCreate()
         $this->assertInstanceOf('\NumberFormatter', \NumberFormatter::create('en', \NumberFormatter::DECIMAL));
     }
 
+    public function testGetTextAttribute()
+    {
+        IntlTestHelper::requireFullIntl($this);
+
+        parent::testGetTextAttribute();
+    }
+
     protected function getNumberFormatter($locale = 'en', $style = null, $pattern = null)
     {
         return new \NumberFormatter($locale, $style, $pattern);

Util/IntlTestHelper.php

@@ -28,19 +28,21 @@ class IntlTestHelper
 {
     /**
      * Should be called before tests that work fine with the stub implementation.
-     *
-     * @param \PhpUnit_Framework_TestCase $testCase
      */
-    public static function requireIntl(\PHPUnit_Framework_TestCase $testCase)
+    public static function requireIntl(\PHPUnit_Framework_TestCase $testCase, $minimumIcuVersion = null)
     {
+        if (null === $minimumIcuVersion) {
+            $minimumIcuVersion = Intl::getIcuStubVersion();
+        }
+
         // We only run tests if the version is *one specific version*.
         // This condition is satisfied if
         //
         //   * the intl extension is loaded with version Intl::getIcuStubVersion()
         //   * the intl extension is not loaded
 
-        if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', 1)) {
-            $testCase->markTestSkipped('ICU version '.Intl::getIcuStubVersion().' is required.');
+        if (($minimumIcuVersion || defined('HHVM_VERSION_ID')) && IcuVersion::compare(Intl::getIcuVersion(), $minimumIcuVersion, '!=', 1)) {
+            $testCase->markTestSkipped('ICU version '.$minimumIcuVersion.' is required.');
         }
 
         // Normalize the default locale in case this is not done explicitly
@@ -60,24 +62,15 @@ public static function requireIntl(\PHPUnit_Framework_TestCase $testCase)
     /**
      * Should be called before tests that require a feature-complete intl
      * implementation.
-     *
-     * @param \PhpUnit_Framework_TestCase $testCase
      */
-    public static function requireFullIntl(\PHPUnit_Framework_TestCase $testCase)
+    public static function requireFullIntl(\PHPUnit_Framework_TestCase $testCase, $minimumIcuVersion = null)
     {
         // We only run tests if the intl extension is loaded...
         if (!Intl::isExtensionLoaded()) {
             $testCase->markTestSkipped('Extension intl is required.');
         }
 
-        // ... and only if the version is *one specific version*
-        if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', 1)) {
-            $testCase->markTestSkipped('ICU version '.Intl::getIcuStubVersion().' is required.');
-        }
-
-        // Normalize the default locale in case this is not done explicitly
-        // in the test
-        \Locale::setDefault('en');
+        self::requireIntl($testCase, $minimumIcuVersion);
 
         // Consequently, tests will
         //
@@ -89,8 +82,6 @@ public static function requireFullIntl(\PHPUnit_Framework_TestCase $testCase)
 
     /**
      * Skips the test unless the current system has a 32bit architecture.
-     *
-     * @param \PhpUnit_Framework_TestCase $testCase
      */
     public static function require32Bit(\PHPUnit_Framework_TestCase $testCase)
     {
@@ -101,8 +92,6 @@ public static function require32Bit(\PHPUnit_Framework_TestCase $testCase)
 
     /**
      * Skips the test unless the current system has a 64bit architecture.
-     *
-     * @param \PhpUnit_Framework_TestCase $testCase
      */
     public static function require64Bit(\PHPUnit_Framework_TestCase $testCase)
     {