Browse Source

Fix tests.

Mark Scherer 10 years ago
parent
commit
143b5f4494
2 changed files with 5 additions and 3 deletions
  1. 1 0
      src/Utility/Time.php
  2. 4 3
      tests/TestCase/Utility/TimeTest.php

+ 1 - 0
src/Utility/Time.php

@@ -74,6 +74,7 @@ class Time extends CakeTime {
 		} else {
 			$timezone = $this->getTimezone();
 		}
+
 		$offset = $timezone->getOffset(new \DateTime('@' . time()));
 		$offset = $offset / HOUR;
 		return $offset;

+ 4 - 3
tests/TestCase/Utility/TimeTest.php

@@ -368,7 +368,6 @@ class TimeTest extends TestCase {
 		$this->assertEquals('6', $this->Time->age('2002-01-29', '2008-12-02'));
 
 		// Leap year
-
 		$this->assertEquals('2', $this->Time->age('2005-03-01', '2008-02-28'));
 		$this->assertEquals('2', $this->Time->age('2005-03-01', '2008-02-29'));
 
@@ -1141,6 +1140,8 @@ class TimeTest extends TestCase {
 		Configure::write('Config.timezone', 'UTC');
 		date_default_timezone_set('UTC');
 
+		$this->Time = new Time();
+
 		$result = $this->Time->getGmtOffset();
 		$this->assertEquals(0, $result);
 
@@ -1166,17 +1167,17 @@ class TimeTest extends TestCase {
 		Configure::write('Config.timezone', 'UTC');
 		date_default_timezone_set('UTC');
 
+		$this->Time = new Time();
+
 		$result = $this->Time->tzOffset(0, false);
 		$this->assertEquals(0, $result);
 
 		Configure::write('Config.timezone', 'Europe/Berlin');
 		date_default_timezone_set('Europe/Berlin');
 
-		/*
 		$factor = date('I') ? 2 : 1;
 		$result = $this->Time->tzOffset($factor * HOUR, false);
 		$this->assertEquals(0, $result);
-		*/
 
 		Configure::write('Config.timezone', $timezone);
 		date_default_timezone_set($phpTimezone);