Changeset 1458
- Timestamp:
- 03/24/08 13:53:07 (6 months ago)
- Files:
-
- trunk/src/main/php/net/stubbles/websites/cache/stubAbstractWebsiteCacheFactory.php (added)
- trunk/src/main/php/net/stubbles/websites/cache/stubDefaultWebsiteCacheFactory.php (modified) (3 diffs)
- trunk/src/test/php/net/stubbles/websites/WebsitesTestSuite.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/websites/cache/stubAbstractWebsiteCacheFactoryTestCase.php (added)
- trunk/src/test/php/net/stubbles/websites/cache/stubDefaultWebsiteCacheFactoryTestCase.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/main/php/net/stubbles/websites/cache/stubDefaultWebsiteCacheFactory.php
r1231 r1458 8 8 */ 9 9 stubClassLoader::load('net::stubbles::util::cache::stubCache', 10 'net::stubbles::websites::cache::stubCachableProcessor', 11 'net::stubbles::websites::cache::stubWebsiteCache', 12 'net::stubbles::websites::cache::stubWebsiteCacheFactory', 10 'net::stubbles::websites::cache::stubAbstractWebsiteCacheFactory', 13 11 'net::stubbles::websites::cache::stubDefaultWebsiteCache', 14 12 'net::stubbles::websites::cache::stubGzipWebsiteCache' … … 17 15 * Default implementation of a website cache factory. 18 16 * 17 * The default implementation delivers a gzip website cache that gzips the 18 * website contents. If this is not possible because the user agent does not 19 * accept gzipped content it falls back to the default website cache 20 * implementation. 21 * 19 22 * @package stubbles 20 23 * @subpackage websites_cache 21 24 */ 22 class stubDefaultWebsiteCacheFactory extends stub BaseObject implements stubWebsiteCacheFactory25 class stubDefaultWebsiteCacheFactory extends stubAbstractWebsiteCacheFactory 23 26 { 24 27 /** … … 40 43 41 44 /** 42 * configures the processor with a website cache factory45 * helper method to retrieve the website cache instance 43 46 * 44 * @ param stubProcessor $processor47 * @return stubWebsiteCache 45 48 */ 46 p ublic function configure(stubProcessor $processor)49 protected function getWebsiteCache() 47 50 { 48 if (($processor instanceof stubCachableProcessor) === false) { 49 return; 50 } 51 52 $cache = new stubGzipWebsiteCache(new stubDefaultWebsiteCache(stubCache::factory($this->cacheContainerId))); 53 $processor->setWebsiteCache($cache); 51 return new stubGzipWebsiteCache(new stubDefaultWebsiteCache(stubCache::factory($this->cacheContainerId))); 54 52 } 55 53 } trunk/src/test/php/net/stubbles/websites/WebsitesTestSuite.php
r1451 r1458 30 30 31 31 // cache 32 $suite->addTestFile($dir . '/cache/stubAbstractWebsiteCacheFactoryTestCase.php'); 32 33 $suite->addTestFile($dir . '/cache/stubAbstractWebsiteCacheTestCase.php'); 33 34 $suite->addTestFile($dir . '/cache/stubDefaultWebsiteCacheFactoryTestCase.php'); trunk/src/test/php/net/stubbles/websites/cache/stubDefaultWebsiteCacheFactoryTestCase.php
r1252 r1458 8 8 */ 9 9 stubClassLoader::load('net::stubbles::websites::cache::stubDefaultWebsiteCacheFactory'); 10 /** 11 * Helper class for the test. 12 * 13 * @package stubbles 14 * @subpackage websites_cache_test 15 */ 16 class TeststubDefaultWebsiteCacheFactory extends stubDefaultWebsiteCacheFactory 17 { 18 /** 19 * helper method to retrieve the website cache instance 20 * 21 * @return stubWebsiteCache 22 */ 23 public function callGetWebsiteCache() 24 { 25 return $this->getWebsiteCache(); 26 } 27 } 10 28 /** 11 29 * Tests for net::stubbles::websites::cache::stubDefaultWebsiteCacheFactory. … … 28 46 public function setUp() 29 47 { 30 $this->defaultWebsiteCacheFactory = new stubDefaultWebsiteCacheFactory(__CLASS__);48 $this->defaultWebsiteCacheFactory = new TeststubDefaultWebsiteCacheFactory(__CLASS__); 31 49 } 32 50 … … 39 57 public function cachableProcessorWithoutConfiguredCache() 40 58 { 41 $cachableProcessor = $this->getMock('stubCachableProcessor'); 42 $this->defaultWebsiteCacheFactory->configure($cachableProcessor); 59 $this->defaultWebsiteCacheFactory->callGetWebsiteCache(); 43 60 } 44 61 … … 53 70 $mockCacheContainer->expects($this->any())->method('getId')->will($this->returnValue(__CLASS__)); 54 71 stubCache::addContainer($mockCacheContainer); 55 $cachableProcessor = $this->getMock('stubCachableProcessor'); 56 $cachableProcessor->expects($this->once())->method('setWebsiteCache'); 57 $this->defaultWebsiteCacheFactory->configure($cachableProcessor); 72 $this->defaultWebsiteCacheFactory->callGetWebsiteCache(); 58 73 } 59 74 }
