diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:25:01 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:25:01 -0700 |
| commit | 62fad6ae9b5218773094bdd9fe55cb08b63dc12d (patch) | |
| tree | 8229e8dd67951c65217fefcd5a51d02d9a76c0a6 /tests | |
| parent | 497d81af68b4e224ec5a7fe9429e391f8087aaef (diff) | |
| parent | 2721b16cc3219c670a04c7bb8ede02022f4abadb (diff) | |
| download | forums-62fad6ae9b5218773094bdd9fe55cb08b63dc12d.tar forums-62fad6ae9b5218773094bdd9fe55cb08b63dc12d.tar.gz forums-62fad6ae9b5218773094bdd9fe55cb08b63dc12d.tar.bz2 forums-62fad6ae9b5218773094bdd9fe55cb08b63dc12d.tar.xz forums-62fad6ae9b5218773094bdd9fe55cb08b63dc12d.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12367' into develop-ascraeus
* github-nickvergessen/ticket/12367:
[ticket/12367] Change phpbb_wrapper_gmgetdate_test to use data providers
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wrapper/gmgetdate_test.php | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/tests/wrapper/gmgetdate_test.php b/tests/wrapper/gmgetdate_test.php index a838cfdba9..2f6c74b434 100644 --- a/tests/wrapper/gmgetdate_test.php +++ b/tests/wrapper/gmgetdate_test.php @@ -11,26 +11,28 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; class phpbb_wrapper_gmgetdate_test extends phpbb_test_case { - public function test_gmgetdate() + public static function phpbb_gmgetdate_data() { - $this->run_gmgetdate_assertion(); - $this->run_test_with_timezone('UTC'); - $this->run_test_with_timezone('Europe/Berlin'); - $this->run_test_with_timezone('America/Los_Angeles'); - $this->run_test_with_timezone('Antarctica/South_Pole'); + return array( + array(''), + array('UTC'), + array('Europe/Berlin'), + array('America/Los_Angeles'), + array('Antarctica/South_Pole'), + ); } - protected function run_test_with_timezone($timezone_identifier) + /** + * @dataProvider phpbb_gmgetdate_data + */ + public function test_phpbb_gmgetdate($timezone_identifier) { - $current_timezone = date_default_timezone_get(); - - date_default_timezone_set($timezone_identifier); - $this->run_gmgetdate_assertion(); - date_default_timezone_set($current_timezone); - } + if ($timezone_identifier) + { + $current_timezone = date_default_timezone_get(); + date_default_timezone_set($timezone_identifier); + } - protected function run_gmgetdate_assertion() - { $expected = time(); $date_array = phpbb_gmgetdate($expected); @@ -45,5 +47,10 @@ class phpbb_wrapper_gmgetdate_test extends phpbb_test_case ); $this->assertEquals($expected, $actual); + + if (isset($current_timezone)) + { + date_default_timezone_set($current_timezone); + } } } |