From 020841b9897b563a1a4e1e6f84a51dafb288eb8e Mon Sep 17 00:00:00 2001
From: gwoo <gwoo@cakephp.org>
Date: Sun, 5 Aug 2007 17:13:03 +0000
Subject: [PATCH] fixing File cache engine expire #3006

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5492 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/cache.php                       |  2 +-
 cake/tests/cases/libs/cache/file.test.php | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index e0253b83f..a5453d94f 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -143,7 +143,7 @@ class Cache extends Object {
 		if (is_resource($value)) {
 			return false;
 		}
-		$duration = ife(is_string($duration), strtotime($duration), intval($duration));
+		$duration = ife(is_string($duration), strtotime($duration) - time(), intval($duration));
 		if ($duration < 1) {
 			return false;
 		}
diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php
index 5edc511ee..12ea74bb3 100644
--- a/cake/tests/cases/libs/cache/file.test.php
+++ b/cake/tests/cases/libs/cache/file.test.php
@@ -66,14 +66,21 @@ class FileEngineTest extends UnitTestCase {
 		$result = Cache::read('other_test');
 		$this->assertFalse($result);
 
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('other_test', $data, "+1 second");
+		$this->assertTrue($result);
+
+		sleep(2);
+		$result = Cache::read('other_test');
+		$this->assertFalse($result);
 	}
 
 	function testDeleteCache() {
 		$data = 'this is a test of the emergency broadcasting system';
-		$result = Cache::write('test', $data);
+		$result = Cache::write('delete_test', $data);
 		$this->assertTrue($result);
 
-		$result = Cache::delete('test');
+		$result = Cache::delete('delete_test');
 		$this->assertTrue($result);
 	}