updated tests.

Author: ljonesfl

src/Mvc/Cache/Storage/FileCacheStorage.php

@@ -1,7 +1,9 @@
 <?php
 namespace Neuron\Mvc\Cache\Storage;
 
+use Neuron\Core\System\IClock;
 use Neuron\Core\System\IFileSystem;
+use Neuron\Core\System\RealClock;
 use Neuron\Core\System\RealFileSystem;
 use Neuron\Log\Log;
 use Neuron\Mvc\Cache\Exceptions\CacheException;
@@ -10,18 +12,21 @@ class FileCacheStorage implements ICacheStorage
 {
 	private string $_BasePath;
 	private IFileSystem $fs;
+	private IClock $clock;
 
 	/**
 	 * FileCacheStorage constructor
 	 *
 	 * @param string $BasePath
 	 * @param IFileSystem|null $fs File system implementation (null = use real file system)
+	 * @param IClock|null $clock Clock implementation (null = use real clock)
 	 * @throws CacheException
 	 */
-	public function __construct( string $BasePath, ?IFileSystem $fs = null )
+	public function __construct( string $BasePath, ?IFileSystem $fs = null, ?IClock $clock = null )
 	{
 		$this->_BasePath = rtrim( $BasePath, DIRECTORY_SEPARATOR );
 		$this->fs = $fs ?? new RealFileSystem();
+		$this->clock = $clock ?? new RealClock();
 		$this->ensureDirectoryExists( $this->_BasePath );
 	}
 
@@ -76,9 +81,9 @@ public function write( string $Key, string $Content, int $Ttl ): bool
 		}
 
 		$MetaData = [
-			'created' => time(),
+			'created' => $this->clock->time(),
 			'ttl' => $Ttl,
-			'expires' => time() + $Ttl
+			'expires' => $this->clock->time() + $Ttl
 		];
 
 		$MetaWritten = $this->fs->writeFile( $MetaPath, json_encode( $MetaData ) ) !== false;
@@ -177,7 +182,7 @@ public function isExpired( string $Key ): bool
 			return true;
 		}
 
-		return time() > $MetaData['expires'];
+		return $this->clock->time() > $MetaData['expires'];
 	}
 
 	/**
@@ -334,7 +339,7 @@ private function scanAndClean( string $Dir, int &$Count ): void
 				{
 					$MetaData = json_decode( $MetaContent, true );
 
-					if( $MetaData && isset( $MetaData['expires'] ) && time() > $MetaData['expires'] )
+					if( $MetaData && isset( $MetaData['expires'] ) && $this->clock->time() > $MetaData['expires'] )
 					{
 						Log::debug( "Cache entry expired for key: $ItemPath" );
 

tests/Mvc/Cache/FileCacheStorageTest.php

@@ -1,25 +1,29 @@
 <?php
 namespace Mvc\Cache;
 
+use Neuron\Core\System\FrozenClock;
 use Neuron\Mvc\Cache\Exceptions\CacheException;
 use Neuron\Mvc\Cache\Storage\FileCacheStorage;
 use PHPUnit\Framework\TestCase;
 use org\bovigo\vfs\vfsStream;
 
 /**
  * Tests FileCacheStorage using vfsStream for isolation and speed.
+ * Uses FrozenClock for instant time-based tests without sleep().
  * Note: Some operations like clear() don't work with vfsStream due to its limitations.
  * See FileCacheStorageRealTest for tests using real filesystem.
  */
 class FileCacheStorageTest extends TestCase
 {
 	private $Root;
 	private FileCacheStorage $Storage;
+	private FrozenClock $Clock;
 
 	protected function setUp(): void
 	{
 		$this->Root = vfsStream::setup( 'cache' );
-		$this->Storage = new FileCacheStorage( vfsStream::url( 'cache' ) );
+		$this->Clock = new FrozenClock( 1000000 ); // Start at a fixed time
+		$this->Storage = new FileCacheStorage( vfsStream::url( 'cache' ), null, $this->Clock );
 	}
 
 	public function testWriteAndRead()
@@ -71,12 +75,13 @@ public function testIsExpired()
 	{
 		$Key = 'test_expired';
 		$Content = 'Test content';
-		
+
 		$this->Storage->write( $Key, $Content, 1 );
 		$this->assertFalse( $this->Storage->isExpired( $Key ) );
-		
-		sleep( 2 );
-		
+
+		// Advance time by 2 seconds (instant, no actual sleeping)
+		$this->Clock->advance( 2 );
+
 		$this->assertTrue( $this->Storage->isExpired( $Key ) );
 		$this->assertNull( $this->Storage->read( $Key ) );
 	}
@@ -181,20 +186,20 @@ public function testGarbageCollection()
 		$this->Storage->write( 'keep2', 'content2', 3600 ); // Keep for 1 hour
 		$this->Storage->write( 'expire1', 'content3', 1 ); // Expire in 1 second
 		$this->Storage->write( 'expire2', 'content4', 1 ); // Expire in 1 second
-		
+
 		// All should exist initially
 		$this->assertTrue( $this->Storage->exists( 'keep1' ) );
 		$this->assertTrue( $this->Storage->exists( 'keep2' ) );
 		$this->assertTrue( $this->Storage->exists( 'expire1' ) );
 		$this->assertTrue( $this->Storage->exists( 'expire2' ) );
-		
-		// Wait for some entries to expire
-		sleep( 2 );
-		
+
+		// Advance time by 2 seconds (instant, no actual sleeping)
+		$this->Clock->advance( 2 );
+
 		// Run garbage collection
 		$Removed = $this->Storage->gc();
 		$this->assertEquals( 2, $Removed );
-		
+
 		// Check that only non-expired entries remain
 		$this->assertTrue( $this->Storage->exists( 'keep1' ) );
 		$this->assertTrue( $this->Storage->exists( 'keep2' ) );
@@ -212,9 +217,10 @@ public function testReadExpiredEntry()
 	{
 		$Key = 'test_read_expired';
 		$this->Storage->write( $Key, 'content', 1 );
-		
-		sleep( 2 );
-		
+
+		// Advance time by 2 seconds (instant, no actual sleeping)
+		$this->Clock->advance( 2 );
+
 		// Reading expired entry should return null and delete it
 		$this->assertNull( $this->Storage->read( $Key ) );
 		$this->assertFalse( $this->Storage->exists( $Key ) );
@@ -277,7 +283,7 @@ public function testIsExpiredWithIncompleteMetaData()
 			->withContent( 'content' );
 		vfsStream::newFile( $Hash . '.meta' )
 			->at( $Dir )
-			->withContent( json_encode( [ 'created' => time() ] ) );
+			->withContent( json_encode( [ 'created' => $this->Clock->time() ] ) );
 
 		// Should be considered expired if meta data is incomplete
 		$this->assertTrue( $this->Storage->isExpired( $Key ) );