From 9e01dd3478166bb67c60c9d49af119dc287fc60d Mon Sep 17 00:00:00 2001
From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 22 Mar 2013 15:23:28 +0100
Subject: [PATCH] TimeAdjustTest: Use dataProvider

Also removes setting of wgContLang/wgLanguageCode, because test extends
MediaWiki*Lang*TestCase

Change-Id: I8a24fbe161c8f2ecae7591baf99845ff4434f983
---
 tests/phpunit/includes/TimeAdjustTest.php | 39 ++++++++++-------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/tests/phpunit/includes/TimeAdjustTest.php b/tests/phpunit/includes/TimeAdjustTest.php
index a58702b257..3a2c62a41b 100644
--- a/tests/phpunit/includes/TimeAdjustTest.php
+++ b/tests/phpunit/includes/TimeAdjustTest.php
@@ -4,22 +4,27 @@ class TimeAdjustTest extends MediaWikiLangTestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->setMwGlobals( array(
-			'wgLocalTZoffset' => null,
-			'wgContLang' => Language::factory( 'en' ),
-			'wgLanguageCode' => 'en',
-		) );
-
 		$this->iniSet( 'precision', 15 );
 	}
 
-	# Test offset usage for a given language::userAdjust
-	function testUserAdjust() {
-		global $wgLocalTZoffset, $wgContLang;
+	/**
+	 * Test offset usage for a given language::userAdjust
+	 * @dataProvider dataUserAdjust
+	 */
+	public function testUserAdjust( $date, $localTZoffset, $expected ) {
+		global $wgContLang;
+
+		$this->setMwGlobals( 'wgLocalTZoffset', $localTZoffset );
 
-		#  Collection of parameters for Language_t_Offset.
-		# Format: date to be formatted, localTZoffset value, expected date
-		$userAdjust_tests = array(
+		$this->assertEquals(
+			strval( $expected ),
+			strval( $wgContLang->userAdjust( $date, '' ) ),
+			"User adjust {$date} by {$localTZoffset} minutes should give {$expected}"
+		);
+	}
+
+	public static function dataUserAdjust() {
+		return array(
 			array( 20061231235959, 0, 20061231235959 ),
 			array( 20061231235959, 5, 20070101000459 ),
 			array( 20061231235959, 15, 20070101001459 ),
@@ -31,15 +36,5 @@ class TimeAdjustTest extends MediaWikiLangTestCase {
 			array( 20061231235959, -30, 20061231232959 ),
 			array( 20061231235959, -60, 20061231225959 ),
 		);
-
-		foreach ( $userAdjust_tests as $data ) {
-			$wgLocalTZoffset = $data[1];
-
-			$this->assertEquals(
-				strval( $data[2] ),
-				strval( $wgContLang->userAdjust( $data[0], '' ) ),
-				"User adjust {$data[0]} by {$data[1]} minutes should give {$data[2]}"
-			);
-		}
 	}
 }
-- 
2.20.1