Merge "(Bug 44987) Allow n=form in plural syntax"

[lhc/web/wiklou.git] / tests / phpunit / includes / TimeAdjustTest.php

diff --git a/tests/phpunit/includes/TimeAdjustTest.php b/tests/phpunit/includes/TimeAdjustTest.php
index 820e713..a58702b 100644 (file)
--- a/tests/phpunit/includes/TimeAdjustTest.php
+++ b/tests/phpunit/includes/TimeAdjustTest.php
@@ -1,37 +1,33 @@
 <?php
 
-class TimeAdjustTest extends PHPUnit_Framework_TestCase {
-       static $offset;
+class TimeAdjustTest extends MediaWikiLangTestCase {
+       protected function setUp() {
+               parent::setUp();
 
-       public function setUp() {
-               global $wgLocalTZoffset;
-               self::$offset = $wgLocalTZoffset;
+               $this->setMwGlobals( array(
+                       'wgLocalTZoffset' => null,
+                       'wgContLang' => Language::factory( 'en' ),
+                       'wgLanguageCode' => 'en',
+               ) );
 
                $this->iniSet( 'precision', 15 );
        }
 
-       public function tearDown() {
-               global $wgLocalTZoffset;
-               $wgLocalTZoffset = self::$offset;
-       }
-
        # Test offset usage for a given language::userAdjust
        function testUserAdjust() {
                global $wgLocalTZoffset, $wgContLang;
 
-               $wgContLang = $en = Language::factory( 'en' );
-
                #  Collection of parameters for Language_t_Offset.
                # Format: date to be formatted, localTZoffset value, expected date
                $userAdjust_tests = array(
-                       array( 20061231235959,   0, 20061231235959 ),
-                       array( 20061231235959,   5, 20070101000459 ),
-                       array( 20061231235959,  15, 20070101001459 ),
-                       array( 20061231235959,  60, 20070101005959 ),
-                       array( 20061231235959,  90, 20070101012959 ),
+                       array( 20061231235959, 0, 20061231235959 ),
+                       array( 20061231235959, 5, 20070101000459 ),
+                       array( 20061231235959, 15, 20070101001459 ),
+                       array( 20061231235959, 60, 20070101005959 ),
+                       array( 20061231235959, 90, 20070101012959 ),
                        array( 20061231235959, 120, 20070101015959 ),
                        array( 20061231235959, 540, 20070101085959 ),
-                       array( 20061231235959,  -5, 20061231235459 ),
+                       array( 20061231235959, -5, 20061231235459 ),
                        array( 20061231235959, -30, 20061231232959 ),
                        array( 20061231235959, -60, 20061231225959 ),
                );
@@ -41,7 +37,7 @@ class TimeAdjustTest extends PHPUnit_Framework_TestCase {
 
                        $this->assertEquals(
                                strval( $data[2] ),
-                               strval( $en->userAdjust( $data[0], '' ) ),
+                               strval( $wgContLang->userAdjust( $data[0], '' ) ),
                                "User adjust {$data[0]} by {$data[1]} minutes should give {$data[2]}"
                        );
                }