diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-03-09 16:16:16 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-03-09 16:16:16 +0100 |
| commit | d34662122df80daae837639b62acd4a46ac93351 (patch) | |
| tree | 9fda68d5c100bda00363815b1ac6db0e17ec82f6 /tests/lib | |
| parent | 01cd83a9020d70458469df29ab2feb891ff5696a (diff) | |
| parent | 276d67808013927c8777ffd92a2cbe09285f449f (diff) | |
| download | nextcloud-server-d34662122df80daae837639b62acd4a46ac93351.tar.gz nextcloud-server-d34662122df80daae837639b62acd4a46ac93351.zip | |
Merge pull request #14429 from owncloud/issue/14176-validate-timezone-before-using
Etc timezones don't exist for .5 and .75 offsets
Diffstat (limited to 'tests/lib')
| -rw-r--r-- | tests/lib/util.php | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/tests/lib/util.php b/tests/lib/util.php index 6870b218076..a852eee8ad6 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -52,16 +52,31 @@ class Test_Util extends \Test\TestCase { OC_Util::formatDate(1350129205, false, 'Mordor/Barad-dûr'); } - function testFormatDateWithTZFromSession() { + public function formatDateWithTZFromSessionData() + { + return array( + array(3, 'October 13, 2012 at 2:53:25 PM GMT+3'), + array(15, 'October 13, 2012 at 11:53:25 AM GMT+0'), + array(-13, 'October 13, 2012 at 11:53:25 AM GMT+0'), + array(3.5, 'October 13, 2012 at 3:23:25 PM GMT+3:30'), + array(9.5, 'October 13, 2012 at 9:23:25 PM GMT+9:30'), + array(-4.5, 'October 13, 2012 at 7:23:25 AM GMT-4:30'), + array(15.5, 'October 13, 2012 at 11:53:25 AM GMT+0'), + ); + } + + /** + * @dataProvider formatDateWithTZFromSessionData + */ + function testFormatDateWithTZFromSession($offset, $expected) { date_default_timezone_set("UTC"); $oldDateTimeFormatter = \OC::$server->query('DateTimeFormatter'); - \OC::$server->getSession()->set('timezone', 3); + \OC::$server->getSession()->set('timezone', $offset); $newDateTimeFormatter = new \OC\DateTimeFormatter(\OC::$server->getDateTimeZone()->getTimeZone(), new \OC_L10N('lib', 'en')); $this->setDateFormatter($newDateTimeFormatter); $result = OC_Util::formatDate(1350129205, false); - $expected = 'October 13, 2012 at 2:53:25 PM GMT+3'; $this->assertEquals($expected, $result); $this->setDateFormatter($oldDateTimeFormatter); |