From 31831cc43677268072bffbe132919e9c023bcc88 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 12 Apr 2010 06:29:13 +0200 Subject: [PATCH] Setting the timezone when including the file has undesired side effects when running the complete test suite. The tests need to ensure that they clean up afterwards. --- framework/Date/test/Horde/Date/DateTest.php | 13 ++++++++++++- framework/Date/test/Horde/Date/RecurrenceTest.php | 8 +++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/framework/Date/test/Horde/Date/DateTest.php b/framework/Date/test/Horde/Date/DateTest.php index 626d6968c..6b40c9412 100644 --- a/framework/Date/test/Horde/Date/DateTest.php +++ b/framework/Date/test/Horde/Date/DateTest.php @@ -8,7 +8,7 @@ require_once dirname(__FILE__) . '/../../../lib/Horde/Date.php'; require_once dirname(__FILE__) . '/../../../lib/Horde/Date/Utils.php'; require_once dirname(__FILE__) . '/../../../lib/Horde/Date/Span.php'; -date_default_timezone_set('Europe/Berlin'); + /** * @category Horde @@ -17,6 +17,17 @@ date_default_timezone_set('Europe/Berlin'); */ class Horde_Date_DateTest extends PHPUnit_Framework_TestCase { + public function setUp() + { + $this->_oldTimezone = date_default_timezone_get(); + date_default_timezone_set('Europe/Berlin'); + } + + public function tearDown() + { + date_default_timezone_set($this->_oldTimezone); + } + public function testConstructor() { $date = new stdClass(); diff --git a/framework/Date/test/Horde/Date/RecurrenceTest.php b/framework/Date/test/Horde/Date/RecurrenceTest.php index f3c82be79..93ce16e9d 100644 --- a/framework/Date/test/Horde/Date/RecurrenceTest.php +++ b/framework/Date/test/Horde/Date/RecurrenceTest.php @@ -11,7 +11,6 @@ require_once 'Horde/iCalendar.php'; require_once dirname(__FILE__) . '/../../../lib/Horde/Date.php'; require_once dirname(__FILE__) . '/../../../lib/Horde/Date/Recurrence.php'; require_once dirname(__FILE__) . '/../../../lib/Horde/Date/Utils.php'; -date_default_timezone_set('Europe/Berlin'); /** * @category Horde @@ -24,6 +23,13 @@ class Horde_Date_RecurrenceTest extends PHPUnit_Framework_TestCase { Horde_String::setDefaultCharset('UTF-8'); $this->ical = new Horde_iCalendar(); + $this->_oldTimezone = date_default_timezone_get(); + date_default_timezone_set('Europe/Berlin'); + } + + public function tearDown() + { + date_default_timezone_set($this->_oldTimezone); } private function _getRecurrences($r) -- 2.11.0