1 files changed, 23 insertions, 33 deletions
diff --git a/tests/phpunit/includes/TimeAdjustTest.php b/tests/phpunit/includes/TimeAdjustTest.php
index cd027c5b..0b368c25 100644
--- a/tests/phpunit/includes/TimeAdjustTest.php
+++ b/tests/phpunit/includes/TimeAdjustTest.php
@@ -1,51 +1,41 @@
 <?php
 
 class TimeAdjustTest extends MediaWikiLangTestCase {
-	static $offset;
-
-	public function setUp() {
+	protected function setUp() {
 		parent::setUp();
-		global $wgLocalTZoffset;
-		self::$offset = $wgLocalTZoffset;
 
 		$this->iniSet( 'precision', 15 );
 	}
 
-	public function tearDown() {
-		global $wgLocalTZoffset;
-		$wgLocalTZoffset = self::$offset;
-		parent::tearDown();
-	}
+	/**
+	 * Test offset usage for a given Language::userAdjust
+	 * @dataProvider dataUserAdjust
+	 * @covers Language::userAdjust
+	 */
+	public function testUserAdjust( $date, $localTZoffset, $expected ) {
+		global $wgContLang;
 
-	# Test offset usage for a given language::userAdjust
-	function testUserAdjust() {
-		global $wgLocalTZoffset, $wgContLang;
+		$this->setMwGlobals( 'wgLocalTZoffset', $localTZoffset );
 
-		$wgContLang = $en = Language::factory( 'en' );
+		$this->assertEquals(
+			strval( $expected ),
+			strval( $wgContLang->userAdjust( $date, '' ) ),
+			"User adjust {$date} by {$localTZoffset} minutes should give {$expected}"
+		);
+	}
 
-		#  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 ),
+	public static function dataUserAdjust() {
+		return array(
+			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 ),
 		);
-
-		foreach ( $userAdjust_tests as $data ) {
-			$wgLocalTZoffset = $data[1];
-
-			$this->assertEquals(
-				strval( $data[2] ),
-				strval( $en->userAdjust( $data[0], '' ) ),
-				"User adjust {$data[0]} by {$data[1]} minutes should give {$data[2]}"
-			);
-		}
 	}
 }