Changeset 1252

Show
Ignore:
Timestamp:
01/17/08 08:56:47 (10 months ago)
Author:
mikey
Message:

continued refactoring #118: converted tests for net::stubbles::websites::cache and net::stubbles::websites::processors

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/test/AllTests.php

    r1250 r1252  
    77 * @subpackage  test 
    88 */ 
     9ini_set('memory_limit', -1); 
    910if (defined('PHPUnit_MAIN_METHOD') === false) { 
    1011    define('PHPUnit_MAIN_METHOD', 'src_test_AllTests::main'); 
  • trunk/src/test/php/net/stubbles/websites/WebsitesTestSuite.php

    r1250 r1252  
    2828         
    2929        // cache tests 
    30         /*$suite->addTestFile($dir . '/cache/stubAbstractWebsiteCacheTestCase.php'); 
     30        $suite->addTestFile($dir . '/cache/stubAbstractWebsiteCacheTestCase.php'); 
    3131        $suite->addTestFile($dir . '/cache/stubDefaultWebsiteCacheFactoryTestCase.php'); 
    3232        $suite->addTestFile($dir . '/cache/stubDefaultWebsiteCacheTestCase.php'); 
    33         $suite->addTestFile($dir . '/cache/stubGzipWebsiteCacheTestCase.php');*/ 
     33        $suite->addTestFile($dir . '/cache/stubGzipWebsiteCacheTestCase.php'); 
    3434 
    3535        // memphis tests 
     
    3939 
    4040        // processors tests 
    41         /*$suite->addTestFile($dir . '/processors/stubAbstractProcessorResolverTestCase.php'); 
     41        $suite->addTestFile($dir . '/processors/stubAbstractProcessorResolverTestCase.php'); 
    4242        $suite->addTestFile($dir . '/processors/stubDefaultProcessorResolverTestCase.php'); 
    4343        $suite->addTestFile($dir . '/processors/stubProcessorResolverXJConfFactoryTestCase.php'); 
    44         $suite->addTestFile($dir . '/processors/stubSimpleProcessorResolverTestCase.php');*/ 
     44        $suite->addTestFile($dir . '/processors/stubSimpleProcessorResolverTestCase.php'); 
    4545 
    4646        // xml tests 
  • trunk/src/test/php/net/stubbles/websites/cache/stubAbstractWebsiteCacheTestCase.php

    r1231 r1252  
    88 */ 
    99stubClassLoader::load('net::stubbles::websites::cache::stubAbstractWebsiteCache'); 
    10 Mock::generatePartial('stubAbstractWebsiteCache', 
    11                       'PartialMockstubAbstractWebsiteCache', 
    12                       array('doRetrieve', 
    13                             'doStore', 
    14                             'isUsedFilesCheckEnabled', 
    15                             'getUsedFiles', 
    16                             'log', 
    17                             'getCacheVars', 
    18                             'setCheckFiles', 
    19                             'addCacheVar', 
    20                             'addCacheVars', 
    21                             'addUsedFile', 
    22                             'addUsedFiles' 
    23                       ) 
    24 ); 
    25 Mock::generate('stubRequest'); 
    26 Mock::generate('stubSession'); 
    27 Mock::generate('stubResponse'); 
    28 Mock::generate('stubCacheContainer'); 
    2910/** 
    3011 * Helper class for unit test to set the cache container to be used. 
     
    3314 * @subpackage  websites_cache_test 
    3415 */ 
    35 class TestPartialMockstubAbstractWebsiteCache extends PartialMockstubAbstractWebsiteCache 
     16abstract class TeststubAbstractWebsiteCache extends stubAbstractWebsiteCache 
    3617{ 
    3718    /** 
     
    6142 * @subpackage  websites_cache_test 
    6243 */ 
    63 class stubAbstractWebsiteCacheTestCase extends UnitTestCase 
     44class stubAbstractWebsiteCacheTestCase extends PHPUnit_Framework_TestCase 
    6445{ 
    6546    /** 
    6647     * instance to be used for tests 
    6748     * 
    68      * @var  TestPartialMockstubAbstractWebsiteCache 
     49     * @var  TeststubAbstractWebsiteCache 
    6950     */ 
    7051    protected $abstractWebsiteCache; 
     
    7253     * mocked cache container instance 
    7354     * 
    74      * @var  SimpleMock 
     55     * @var  PHPUnit_Framework_MockObject_MockObject 
    7556     */ 
    7657    protected $mockCacheContainer; 
     
    7859     * mocked request instance 
    7960     * 
    80      * @var  SimpleMock 
     61     * @var  PHPUnit_Framework_MockObject_MockObject 
    8162     */ 
    8263    protected $mockRequest; 
     
    8465     * mocked session instance 
    8566     * 
    86      * @var  SimpleMock 
     67     * @var  PHPUnit_Framework_MockObject_MockObject 
    8768     */ 
    8869    protected $mockSession; 
     
    9071     * mocked response instance 
    9172     * 
    92      * @var  SimpleMock 
     73     * @var  PHPUnit_Framework_MockObject_MockObject 
    9374     */ 
    9475    protected $mockResponse; 
    95      
     76  
    9677    /** 
    9778     * set up test environment 
     
    9980    public function setUp() 
    10081    { 
    101         $this->abstractWebsiteCache = new TestPartialMockstubAbstractWebsiteCache(); 
    102         $this->mockCacheContainer   = new MockstubCacheContainer(); 
     82        $this->abstractWebsiteCache = $this->getMock('TeststubAbstractWebsiteCache', array('doRetrieve', 
     83                                                                                           'doStore', 
     84                                                                                           'isUsedFilesCheckEnabled', 
     85                                                                                           'getUsedFiles', 
     86                                                                                           'log', 
     87                                                                                           'getCacheVars', 
     88                                                                                           'setCheckFiles', 
     89                                                                                           'addCacheVar', 
     90                                                                                           'addCacheVars', 
     91                                                                                           'addUsedFile', 
     92                                                                                           'addUsedFiles' 
     93                                                                                     ) 
     94                                      ); 
     95        $this->mockCacheContainer   = $this->getMock('stubCacheContainer'); 
    10396        $this->abstractWebsiteCache->setCacheContainer($this->mockCacheContainer); 
    104         $this->abstractWebsiteCache->setReturnValue('getCacheVars', array('foo' => 'bar')); 
    105         $this->mockRequest  = new MockstubRequest(); 
    106         $this->mockSession  = new MockstubSession(); 
    107         $this->mockResponse = new MockstubResponse(); 
     97        $this->abstractWebsiteCache->expects($this->any()) 
     98                              ->method('getCacheVars') 
     99                              ->will($this->returnValue(array('foo' => 'bar'))); 
     100        $this->mockRequest  = $this->getMock('stubRequest'); 
     101        $this->mockSession  = $this->getMock('stubSession'); 
     102        $this->mockResponse = $this->getMock('stubResponse'); 
    108103        stubMode::setCurrent(stubMode::$PROD); 
    109104    } 
     
    111106    /** 
    112107     * assure that disabled caching leads to nothing set in the response 
    113      */ 
    114     public function testRetrieveCachingDisabled() 
     108     * 
     109     * @test 
     110     */ 
     111    public function retrieveCachingDisabled() 
    115112    { 
    116113        stubMode::setCurrent(stubMode::$DEV); 
    117         $this->abstractWebsiteCache->expectOnce('log', array('baz', '*', stubWebsiteCache::MISS)); 
    118         $this->abstractWebsiteCache->expectNever('doRetrieve'); 
    119         $this->mockResponse->expectNever('addHeader'); 
    120         $this->mockCacheContainer->expectNever('has'); 
     114        $this->abstractWebsiteCache->expects($this->once()) 
     115                                   ->method('log') 
     116                                   ->with($this->equalTo('baz'), $this->anything(), $this->equalTo(stubWebsiteCache::MISS)); 
     117        $this->abstractWebsiteCache->expects($this->never())->method('doRetrieve'); 
     118        $this->mockResponse->expects($this->never())->method('addHeader'); 
     119        $this->mockCacheContainer->expects($this->never())->method('has'); 
    121120        $this->assertFalse($this->abstractWebsiteCache->retrieve($this->mockRequest, $this->mockSession, $this->mockResponse, 'baz')); 
    122         $this->assertEqual($this->abstractWebsiteCache->getMissReason(), 'disabled'); 
     121        $this->assertEquals('disabled', $this->abstractWebsiteCache->getMissReason()); 
    123122    } 
    124123 
    125124    /** 
    126125     * assure that a missing cache entry leads to nothing set in the response 
    127      */ 
    128     public function testCachingEntryMissing() 
    129     { 
    130         $this->abstractWebsiteCache->expectOnce('log', array('baz', '*', stubWebsiteCache::MISS)); 
    131         $this->abstractWebsiteCache->expectNever('doRetrieve'); 
    132         $this->mockResponse->expectNever('addHeader'); 
    133         $this->mockCacheContainer->expectOnce('has'); 
    134         $this->mockCacheContainer->setReturnValue('has', false); 
     126     * 
     127     * @test 
     128     */ 
     129    public function cachingEntryMissing() 
     130    { 
     131        $this->abstractWebsiteCache->expects($this->once()) 
     132                                   ->method('log') 
     133                                   ->with($this->equalTo('baz'), $this->anything(), $this->equalTo(stubWebsiteCache::MISS)); 
     134        $this->abstractWebsiteCache->expects($this->never())->method('doRetrieve'); 
     135        $this->mockResponse->expects($this->never())->method('addHeader'); 
     136        $this->mockCacheContainer->expects($this->once())->method('has')->will($this->returnValue(false)); 
    135137        $this->assertFalse($this->abstractWebsiteCache->retrieve($this->mockRequest, $this->mockSession, $this->mockResponse, 'baz')); 
    136         $this->assertEqual($this->abstractWebsiteCache->getMissReason(), 'no cache file'); 
     138        $this->assertEquals('no cache file', $this->abstractWebsiteCache->getMissReason()); 
    137139    } 
    138140 
    139141    /** 
    140142     * assure that a failing to set the response works as expected 
    141      */ 
    142     public function testCachingEntryFoundAndFailedToSet() 
    143     { 
    144         $this->abstractWebsiteCache->expectOnce('log', array('baz', '*', stubWebsiteCache::MISS)); 
    145         $this->abstractWebsiteCache->expectOnce('doRetrieve', array($this->mockRequest, $this->mockSession, $this->mockResponse, '*')); 
    146         $this->abstractWebsiteCache->setReturnValue('doRetrieve', false); 
    147         $this->abstractWebsiteCache->setReturnValue('isUsedFilesCheckEnabled', false); 
    148         $this->abstractWebsiteCache->expectNever('getUsedFiles'); 
    149         $this->mockResponse->expectNever('addHeader'); 
    150         $this->mockCacheContainer->expectOnce('has'); 
    151         $this->mockCacheContainer->setReturnValue('has', true); 
     143     * 
     144     * @test 
     145     */ 
     146    public function cachingEntryFoundAndFailedToSet() 
     147    { 
     148        $this->abstractWebsiteCache->expects($this->once()) 
     149                                   ->method('log') 
     150                                   ->with($this->equalTo('baz'), $this->anything(), $this->equalTo(stubWebsiteCache::MISS)); 
     151        $this->abstractWebsiteCache->expects($this->once()) 
     152                                   ->method('doRetrieve') 
     153                                   ->with($this->equalTo($this->mockRequest), $this->equalTo($this->mockSession), $this->equalTo($this->mockResponse)) 
     154                                   ->will($this->returnValue(false)); 
     155        $this->abstractWebsiteCache->expects($this->once())->method('isUsedFilesCheckEnabled')->will($this->returnValue(false)); 
     156        $this->abstractWebsiteCache->expects($this->never())->method('getUsedFiles'); 
     157        $this->mockResponse->expects($this->never())->method('addHeader'); 
     158        $this->mockCacheContainer->expects($this->once())->method('has')->will($this->returnValue(true)); 
    152159        $this->assertFalse($this->abstractWebsiteCache->retrieve($this->mockRequest, $this->mockSession, $this->mockResponse, 'baz')); 
    153         $this->assertEqual($this->abstractWebsiteCache->getMissReason(), ''); 
     160        $this->assertEquals('', $this->abstractWebsiteCache->getMissReason()); 
    154161    } 
    155162 
    156163    /** 
    157164     * assure that a response data is set 
    158      */ 
    159     public function testCachingEntryFound() 
    160     { 
    161         $this->abstractWebsiteCache->expectOnce('log', array('baz', '*', stubWebsiteCache::HIT)); 
    162         $this->abstractWebsiteCache->expectOnce('doRetrieve', array($this->mockRequest, $this->mockSession, $this->mockResponse, '*')); 
    163         $this->abstractWebsiteCache->setReturnValue('doRetrieve', true); 
    164         $this->abstractWebsiteCache->setReturnValue('isUsedFilesCheckEnabled', false); 
    165         $this->abstractWebsiteCache->expectNever('getUsedFiles'); 
    166         $this->mockResponse->expectNever('addHeader'); 
    167         $this->mockCacheContainer->expectOnce('has'); 
    168         $this->mockCacheContainer->setReturnValue('has', true); 
     165     * 
     166     * @test 
     167     */ 
     168    public function cachingEntryFound() 
     169    { 
     170        $this->abstractWebsiteCache->expects($this->once()) 
     171                                   ->method('log') 
     172                                   ->with($this->equalTo('baz'), $this->anything(), $this->equalTo(stubWebsiteCache::HIT)); 
     173        $this->abstractWebsiteCache->expects($this->once()) 
     174                                   ->method('doRetrieve') 
     175                                   ->with($this->equalTo($this->mockRequest), $this->equalTo($this->mockSession), $this->equalTo($this->mockResponse)) 
     176                                   ->will($this->returnValue(true)); 
     177        $this->abstractWebsiteCache->expects($this->once())->method('isUsedFilesCheckEnabled')->will($this->returnValue(false)); 
     178        $this->abstractWebsiteCache->expects($this->never())->method('getUsedFiles'); 
     179        $this->mockResponse->expects($this->never())->method('addHeader'); 
     180        $this->mockCacheContainer->expects($this->once())->method('has')->will($this->returnValue(true)); 
    169181        $this->assertTrue($this->abstractWebsiteCache->retrieve($this->mockRequest, $this->mockSession, $this->mockResponse, 'baz')); 
    170         $this->assertEqual($this->abstractWebsiteCache->getMissReason(), ''); 
     182        $this->assertEquals('', $this->abstractWebsiteCache->getMissReason()); 
    171183    } 
    172184 
    173185    /** 
    174186     * assure that a response data is set 
    175      */ 
    176     public function testCachingEntryFoundTestMode() 
     187     * 
     188     * @test 
     189     */ 
     190    public function cachingEntryFoundTestMode() 
    177191    { 
    178192        stubMode::setCurrent(stubMode::$TEST); 
    179         $this->abstractWebsiteCache->expectOnce('log', array('baz', '*', stubWebsiteCache::HIT)); 
    180         $this->abstractWebsiteCache->expectOnce('doRetrieve', array($this->mockRequest, $this->mockSession, $this->mockResponse, '*')); 
    181         $this->abstractWebsiteCache->setReturnValue('doRetrieve', true); 
    182         $this->abstractWebsiteCache->setReturnValue('isUsedFilesCheckEnabled', false); 
    183         $this->abstractWebsiteCache->expectNever('getUsedFiles'); 
    184         $this->mockResponse->expectOnce('addHeader'); 
    185         $this->mockCacheContainer->expectOnce('has'); 
    186         $this->mockCacheContainer->setReturnValue('has', true); 
     193         $this->abstractWebsiteCache->expects($this->once()) 
     194                                   ->method('log') 
     195                                   ->with($this->equalTo('baz'), $this->anything(), $this->equalTo(stubWebsiteCache::HIT)); 
     196        $this->abstractWebsiteCache->expects($this->once()) 
     197                                   ->method('doRetrieve') 
     198                                   ->with($this->equalTo($this->mockRequest), $this->equalTo($this->mockSession), $this->equalTo($this->mockResponse)) 
     199                                   ->will($this->returnValue(true)); 
     200        $this->abstractWebsiteCache->expects($this->once())->method('isUsedFilesCheckEnabled')->will($this->returnValue(false)); 
     201        $this->abstractWebsiteCache->expects($this->never())->method('getUsedFiles'); 
     202        $this->mockResponse->expects($this->once())->method('addHeader'); 
     203        $this->mockCacheContainer->expects($this->once())->method('has')->will($this->returnValue(true)); 
    187204        $this->assertTrue($this->abstractWebsiteCache->retrieve($this->mockRequest, $this->mockSession, $this->mockResponse, 'baz')); 
    188         $this->assertEqual($this->abstractWebsiteCache->getMissReason(), ''); 
     205        $this->assertEquals('', $this->abstractWebsiteCache->getMissReason()); 
    189206    } 
    190207 
    191208    /** 
    192209     * assure that disabled caching leads to no store 
    193      */ 
    194     public function testStoreCachingDisabled() 
     210     * 
     211     * @test 
     212     */ 
     213    public function storeCachingDisabled() 
    195214    { 
    196215        stubMode::setCurrent(stubMode::$DEV); 
    197         $this->abstractWebsiteCache->expectNever('doStore'); 
     216        $this->abstractWebsiteCache->expects($this->never())->method('doStore'); 
    198217        $this->assertFalse($this->abstractWebsiteCache->store($this->mockRequest, $this->mockResponse, 'baz')); 
    199218    } 
     
    201220    /** 
    202221     * assure that disabled caching leads to storing data 
    203      */ 
    204     public function testStore() 
    205     { 
    206         $this->abstractWebsiteCache->expect('doStore', array($this->mockRequest, $this->mockResponse, '*')); 
    207         $this->abstractWebsiteCache->setReturnValueAt(0, 'doStore', false); 
    208         $this->abstractWebsiteCache->setReturnValueAt(1, 'doStore', true); 
     222     * 
     223     * @test 
     224     */ 
     225    public function store() 
     226    { 
     227        $this->abstractWebsiteCache->expects($this->exactly(2)) 
     228                                   ->method('doStore') 
     229                                   ->with($this->equalTo($this->mockRequest), $this->equalTo($this->mockResponse)) 
     230                                   ->will($this->onConsecutiveCalls(false, true)); 
    209231        $this->assertFalse($this->abstractWebsiteCache->store($this->mockRequest, $this->mockResponse, 'baz')); 
    210232        $this->assertTrue($this->abstractWebsiteCache->store($this->mockRequest, $this->mockResponse, 'baz')); 
  • trunk/src/test/php/net/stubbles/websites/cache/stubDefaultWebsiteCacheFactoryTestCase.php

    r1231 r1252  
    88 */ 
    99stubClassLoader::load('net::stubbles::websites::cache::stubDefaultWebsiteCacheFactory'); 
    10 Mock::generate('stubProcessor'); 
    11 Mock::generate('stubCachableProcessor'); 
    12 Mock::generate('stubCacheContainer'); 
    1310/** 
    1411 * Tests for net::stubbles::websites::cache::stubDefaultWebsiteCacheFactory. 
     
    1714 * @subpackage  websites_cache_test 
    1815 */ 
    19 class stubDefaultWebsiteCacheFactoryTestCase extends UnitTestCase 
     16class stubDefaultWebsiteCacheFactoryTestCase extends PHPUnit_Framework_TestCase 
    2017{ 
    2118    /** 
     
    3633    /** 
    3734     * assure that a cachable processor does get a website cache 
     35     * 
     36     * @test 
     37     * @expectedException  stubRuntimeException 
    3838     */ 
    39     public function testCachableProcessorWithoutConfiguredCache() 
     39    public function cachableProcessorWithoutConfiguredCache() 
    4040    { 
    41         $cachableProcessor = new MockstubCachableProcessor(); 
    42         $this->expectException('stubRuntimeException'); 
     41        $cachableProcessor = $this->getMock('stubCachableProcessor'); 
    4342        $this->defaultWebsiteCacheFactory->configure($cachableProcessor); 
    4443    } 
     
    4645    /** 
    4746     * assure that a cachable processor does get a website cache 
     47     * 
     48     * @test 
    4849     */ 
    49     public function testCachableProcessorWithConfiguredCache() 
     50    public function cachableProcessorWithConfiguredCache() 
    5051    { 
    51         $mockCacheContainer = new MockstubCacheContainer(); 
    52         $mockCacheContainer->setReturnValue('getId', __CLASS__); 
     52        $mockCacheContainer = $this->getMock('stubCacheContainer'); 
     53        $mockCacheContainer->expects($this->any())->method('getId')->will($this->returnValue(__CLASS__)); 
    5354        stubCache::addContainer($mockCacheContainer); 
    54         $cachableProcessor = new MockstubCachableProcessor(); 
    55         $cachableProcessor->expectOnce('setWebsiteCache'); 
     55        $cachableProcessor = $this->getMock('stubCachableProcessor'); 
     56        $cachableProcessor->expects($this->once())->method('setWebsiteCache'); 
    5657        $this->defaultWebsiteCacheFactory->configure($cachableProcessor); 
    5758    } 
  • trunk/src/test/php/net/stubbles/websites/cache/stubDefaultWebsiteCacheTestCase.php

    r1231 r1252  
    88 */ 
    99stubClassLoader::load('net::stubbles::websites::cache::stubDefaultWebsiteCache'); 
    10 Mock::generate('stubRequest'); 
    11 Mock::generate('stubSession'); 
    12 Mock::generate('stubResponse'); 
    13 Mock::generate('stubCacheContainer'); 
    1410/** 
    1511 * Helper class for unit test to access some methods without using implementation 
     
    8480 * @subpackage  websites_cache_test 
    8581 */ 
    86 class stubDefaultWebsiteCacheTestCase extends UnitTestCase 
     82class stubDefaultWebsiteCacheTestCase extends PHPUnit_Framework_TestCase 
    8783{ 
    8884    /** 
     
    9591     * mocked cache container instance 
    9692     * 
    97      * @var  SimpleMock 
     93     * @var  PHPUnit_Framework_MockObject_MockObject 
    9894     */ 
    9995    protected $mockCacheContainer; 
     
    10197     * mocked request instance 
    10298     * 
    103      * @var  SimpleMock 
     99     * @var  PHPUnit_Framework_MockObject_MockObject 
    104100     */ 
    105101    protected $mockRequest; 
     
    107103     * mocked session instance 
    108104     * 
    109      * @var  SimpleMock 
     105     * @var  PHPUnit_Framework_MockObject_MockObject 
    110106     */ 
    111107    protected $mockSession; 
     
    113109     * mocked response instance 
    114110     * 
    115      * @var  SimpleMock 
     111     * @var  PHPUnit_Framework_MockObject_MockObject 
    116112     */ 
    117113    protected $mockResponse; 
     
    122118    public function setUp() 
    123119    { 
    124         $this->mockCacheContainer  = new MockstubCacheContainer(); 
     120        $this->mockCacheContainer  = $this->getMock('stubCacheContainer'); 
    125121        $this->defaultWebsiteCache = new TeststubDefaultWebsiteCache($this->mockCacheContainer); 
    126         $this->mockRequest         = new MockstubRequest(); 
    127         $this->mockSession         = new MockstubSession(); 
    128         $this->mockResponse        = new MockstubResponse(); 
     122        $this->mockRequest         = $this->getMock('stubRequest'); 
     123        $this->mockSession         = $this->getMock('stubSession'); 
     124        $this->mockResponse        = $this->getMock('stubResponse'); 
    129125    } 
    130126 
     
    134130    public function testCacheContainer() 
    135131    { 
    136         $this->assertReference($this->defaultWebsiteCache->getCacheContainer(), $this->mockCacheContainer); 
     132        $this->assertSame($this->mockCacheContainer, $this->defaultWebsiteCache->getCacheContainer()); 
    137133    } 
    138134 
    139135    /** 
    140136     * test that check files switch is handled correct 
    141      */ 
    142     public function testCheckFiles() 
     137     * 
     138     * @test 
     139     */ 
     140    public function checkFiles() 
    143141    { 
    144142        $this->assertFalse($this->defaultWebsiteCache->getCheckFiles()); 
     
    149147    /** 
    150148     * assert that cache variables are handled correct 
    151      */ 
    152     public function testCacheVars() 
    153     { 
    154         $this->assertEqual($this->defaultWebsiteCache->retrieveCacheVars(), array()); 
     149     * 
     150     * @test 
     151     */ 
     152    public function cacheVars() 
     153    { 
     154        $this->assertEquals(array(), $this->defaultWebsiteCache->retrieveCacheVars()); 
    155155        $this->defaultWebsiteCache->addCacheVar('foo', 'bar'); 
    156         $this->assertEqual($this->defaultWebsiteCache->retrieveCacheVars(), array('foo' => 'bar')); 
     156        $this->assertEquals(array('foo' => 'bar'), $this->defaultWebsiteCache->retrieveCacheVars()); 
    157157        $this->defaultWebsiteCache->addCacheVars(array('bar' => 'baz')); 
    158         $this->assertEqual($this->defaultWebsiteCache->retrieveCacheVars(), array('foo' => 'bar', 
    159                                                                                   'bar' => 'baz' 
    160                                                                             ) 
     158        $this->assertEquals(array('foo' => 'bar', 
     159                                  'bar' => 'baz' 
     160                            ), 
     161                            $this->defaultWebsiteCache->retrieveCacheVars() 
    161162        ); 
    162163    } 
     
    164165    /** 
    165166     * assert that used files are handled correct 
    166      */ 
    167     public function testUsedFiles() 
    168     { 
    169         $this->assertEqual($this->defaultWebsiteCache->retrieveUsedFiles(), array()); 
     167     * 
     168     * @test 
     169     */ 
     170    public function usedFiles() 
     171    { 
     172        $this->assertEquals(array(), $this->defaultWebsiteCache->retrieveUsedFiles()); 
    170173        $this->defaultWebsiteCache->addUsedFile('foo.bar'); 
    171         $this->assertEqual($this->defaultWebsiteCache->retrieveUsedFiles(), array('foo.bar' => 'foo.bar')); 
     174        $this->assertEquals(array('foo.bar' => 'foo.bar'), $this->defaultWebsiteCache->retrieveUsedFiles()); 
    172175        $this->defaultWebsiteCache->addUsedFiles(array('bar.baz')); 
    173         $this->assertEqual($this->defaultWebsiteCache->retrieveUsedFiles(), array('foo.bar' => 'foo.bar', 
    174                                                                                   'bar.baz' => 'bar.baz' 
    175                                                                             ) 
     176        $this->assertEquals(array('foo.bar' => 'foo.bar', 
     177                                  'bar.baz' => 'bar.baz' 
     178                            ), 
     179                            $this->defaultWebsiteCache->retrieveUsedFiles() 
    176180        ); 
    177181    } 
     
    179183    /** 
    180184     * assure that disabled caching leads to nothing set in the response 
    181      */ 
    182     public function testRetrieve() 
    183     { 
    184         $this->mockCacheContainer->expectOnce('get', array('foo')); 
    185         $this->mockCacheContainer->setReturnValue('get', 'fooContents'); 
    186         $this->mockResponse->expectOnce('write', array('fooContents')); 
     185     * 
     186     * @test 
     187     */ 
     188    public function retrieve() 
     189    { 
     190        $this->mockCacheContainer->expects($this->once()) 
     191                                 ->method('get') 
     192                                 ->with($this->equalTo('foo')) 
     193                                 ->will($this->returnValue('fooContents')); 
     194        $this->mockResponse->expects($this->once()) 
     195                           ->method('write') 
     196                           ->with($this->equalTo('fooContents')); 
    187197        $this->assertTrue($this->defaultWebsiteCache->retrieve($this->mockRequest, $this->mockSession, $this->mockResponse, 'foo')); 
    188198    } 
     
    190200    /** 
    191201     * assure that a missing cache entry leads to nothing set in the response 
    192      */ 
    193     public function testStore() 
    194     { 
    195         $this->mockResponse->expectOnce('getData'); 
    196         $this->mockResponse->setReturnValue('getData', 'fooContents'); 
    197         $this->mockCacheContainer->expectOnce('put', array('foo', 'fooContents')); 
    198         $this->mockCacheContainer->setReturnValue('put', 11); 
     202     * 
     203     * @test 
     204     */ 
     205    public function store() 
     206    { 
     207        $this->mockResponse->expects($this->once()) 
     208                           ->method('getData') 
     209                           ->will($this->returnValue('fooContents')); 
     210        $this->mockCacheContainer->expects($this->once()) 
     211                                 ->method('put') 
     212                                 ->with($this->equalTo('foo'), $this->equalTo('fooContents')) 
     213                                 ->will($this->returnValue(11)); 
    199214        $this->assertTrue($this->defaultWebsiteCache->store($this->mockRequest, $this->mockResponse, 'foo')); 
    200215    } 
  • trunk/src/test/php/net/stubbles/websites/cache/stubGzipWebsiteCacheTestCase.php

    r1231 r1252  
    88 */ 
    99stubClassLoader::load('net::stubbles::websites::cache::stubGzipWebsiteCache'); 
    10 Mock::generate('stubRequest'); 
    11 Mock::generate('stubSession'); 
    12 Mock::generate('stubResponse'); 
    13 Mock::generate('stubCacheContainer'); 
    14 Mock::generate('stubWebsiteCache'); 
    1510/** 
    1611 * Helper class for unit test to access some methods without using implementation 
     
    6358 * @subpackage  websites_cache_test 
    6459 */ 
    65 class stubGzipWebsiteCacheTestCase extends UnitTestCase 
     60class stubGzipWebsiteCacheTestCase extends PHPUnit_Framework_TestCase 
    6661{ 
    6762    /** 
     
    7469     * mocked decorated website cache 
    7570     * 
    76      * @var  SimpleMock 
     71     * @var  PHPUnit_Framework_MockObject_MockObject 
    7772     */ 
    7873    protected $mockWebsiteCache; 
     
    8075     * mocked cache container instance 
    8176     * 
    82      * @var  SimpleMock 
     77     * @var  PHPUnit_Framework_MockObject_MockObject 
    8378     */ 
    8479    protected $mockCacheContainer; 
     
    8681     * mocked request instance 
    8782     * 
    88      * @var  SimpleMock 
     83     * @var  PHPUnit_Framework_MockObject_MockObject 
    8984     */ 
    9085    protected $mockRequest; 
     
    9287     * mocked session instance 
    9388     * 
    94      * @var  SimpleMock 
     89     * @var  PHPUnit_Framework_MockObject_MockObject 
    9590     */ 
    9691    protected $mockSession; 
     
    9893     * mocked response instance 
    9994     * 
    100      * @var  SimpleMock 
     95     * @var  PHPUnit_Framework_MockObject_MockObject 
    10196     */ 
    10297    protected $mockResponse; 
     
    107102    public function setUp() 
    108103    { 
    109         $this->mockWebsiteCache   = new MockstubWebsiteCache(); 
    110         $this->mockCacheContainer = new MockstubCacheContainer(); 
    111         $this->mockWebsiteCache->setReturnValue('getCacheContainer', $this->mockCacheContainer); 
     104        $this->mockWebsiteCache   = $this->getMock('stubWebsiteCache'); 
     105        $this->mockCacheContainer = $this->getMock('stubCacheContainer'); 
     106        $this->mockWebsiteCache->expects($this->any())->method('getCacheContainer')->will($this->returnValue($this->mockCacheContainer)); 
    112107        $this->gzipWebsiteCache = new TeststubGzipWebsiteCache($this->mockWebsiteCache); 
    113         $this->mockRequest      = new MockstubRequest(); 
    114         $this->mockSession      = new MockstubSession(); 
    115         $this->mockResponse     = new MockstubResponse(); 
     108        $this->mockRequest      = $this->getMock('stubRequest'); 
     109        $this->mockSession      = $this->getMock('stubSession'); 
     110        $this->mockResponse     = $this->getMock('stubResponse'); 
    116111    } 
    117112 
    118113    /** 
    119114     * assert that correct cache container is returned 
    120      */ 
    121     public function testCacheContainer() 
    122     { 
    123         $this->assertReference($this->gzipWebsiteCache->getCacheContainer(), $this->mockCacheContainer); 
     115     * 
     116     * @test 
     117     */ 
     118    public function cacheContainer() 
     119    { 
     120        $this->assertSame($this->mockCacheContainer, $this->gzipWebsiteCache->getCacheContainer()); 
    124121    } 
    125122 
    126123    /** 
    127124     * test that check files switch is handled correct 
    128      */ 
    129     public function testCheckFiles() 
    130     { 
    131         $this->mockWebsiteCache->expectOnce('setCheckFiles', array(true)); 
     125     * 
     126     * @test 
     127     */ 
     128    public function checkFiles() 
     129    { 
     130        $this->mockWebsiteCache->expects($this->once())->method('setCheckFiles')->with($this->equalTo(true)); 
    132131        $this->gzipWebsiteCache->setCheckFiles(true); 
    133132    } 
     
    135134    /** 
    136135     * assert that cache variables are handled correct 
    137      */ 
    138     public function testCacheVars() 
    139     { 
    140         $this->mockWebsiteCache->expectOnce('addCacheVar', array('foo', 'bar')); 
     136     * 
     137     * @test 
     138     */ 
     139    public function cacheVars() 
     140    { 
     141        $this->mockWebsiteCache->expects($this->once())->method('addCacheVar')->with($this->equalTo('foo'), $this->equalTo('bar')); 
    141142        $this->gzipWebsiteCache->addCacheVar('foo', 'bar'); 
    142         $this->mockWebsiteCache->expectOnce('addCacheVars', array(array('foo' => 'bar'))); 
     143        $this->mockWebsiteCache->expects($this->once())->method('addCacheVars')->with($this->equalTo((array('foo' => 'bar')))); 
    143144        $this->gzipWebsiteCache->addCacheVars(array('foo' => 'bar')); 
    144145    } 
     
    146147    /** 
    147148     * assert that used files are handled correct 
    148      */ 
    149     public function testUsedFiles() 
    150     { 
    151         $this->mockWebsiteCache->expectOnce('addUsedFile', array('foo.bar')); 
     149     * 
     150     * @test 
     151     */ 
     152    public function usedFiles() 
     153    { 
     154        $this->mockWebsiteCache->expects($this->once())->method('addUsedFile')->with($this->equalTo('foo.bar')); 
    152155        $this->gzipWebsiteCache->addUsedFile('foo.bar'); 
    153         $this->mockWebsiteCache->expectOnce('addUsedFiles', array(array('foo.bar'))); 
     156        $this->mockWebsiteCache->expects($this->once())->method('addUsedFiles')->with($this->equalTo(array('foo.bar'))); 
    154157        $this->gzipWebsiteCache->addUsedFiles(array('foo.bar')); 
    155158    } 
     
    157160    /** 
    158161     * assert that gzip cache is not active when cookies are not accepted 
    159      */ 
    160     public function testRetrieveCookiesNotAccepted() 
    161     { 
    162         $this->mockRequest->setReturnValue('acceptsCookies', false); 
    163         $this->mockResponse->expectNever('addHeader'); 
    164         $this->mockResponse->expectNever('write'); 
     162     * 
     163     * @test 
     164     */ 
     165    public function retrieveCookiesNotAccepted() 
     166    { 
     167        $this->mockRequest->expects($this->once())->method('acceptsCookies')->will($this->returnValue(false)); 
     168        $this->mockResponse->expects($this->never())->method('addHeader'); 
     169        $this->mockResponse->expects($this->never())->method('write'); 
    165170        $this->assertFalse($this->gzipWebsiteCache->retrieve($this->mockRequest, $this->mockSession, $this->mockResponse, 'foo')); 
    166         $this->assertEqual($this->gzipWebsiteCache->getMissReason(), 'user agent does not accept cookies'); 
     171        $this->assertEquals('user agent does not accept cookies', $this->gzipWebsiteCache->getMissReason()); 
    167172    } 
    168173 
    169174    /** 
    170175     * assert that gzip cache is not active when compression is not accepted 
    171      */ 
    172     public function testRetrieveCompressionNotAccepted() 
    173     { 
    174         $this->mockRequest->setReturnValue('acceptsCookies', true); 
    175         $this->mockRequest->setReturnValue('validateValue', false); 
    176         $this->mockResponse->expectNever('addHeader'); 
    177         $this->mockResponse->expectNever('write'); 
     176     * 
     177     * @test 
     178     */ 
     179    public function retrieveCompressionNotAccepted() 
     180    { 
     181        $this->mockRequest->expects($this->once())->method('acceptsCookies')->will($this->returnValue(true)); 
     182        $this->mockRequest->expects($this->any())->method('validateValue')->will($this->returnValue(false)); 
     183        $this->mockResponse->expects($this->never())->method('addHeader'); 
     184        $this->mockResponse->expects($this->never())->method('write'); 
    178185        $this->assertFalse($this->gzipWebsiteCache->retrieve($this->mockRequest, $this->mockSession, $this->mockResponse, 'foo')); 
    179         $this->assertEqual($this->gzipWebsiteCache->getMissReason(), 'user agent does not accept compressed content'); 
     186        $this->assertEquals('user agent does not accept compressed content', $this->gzipWebsiteCache->getMissReason()); 
    180187    } 
    181188 
    182189    /** 
    183190     * assert that gzip cache returns data in correct compression 
    184      */ 
    185     public function testRetrieveXGzipCompression() 
    186     { 
    187         $this->mockRequest->setReturnValue('acceptsCookies', true); 
    188         $this->mockRequest->setReturnValue('validateValue', true); 
    189         $this->mockResponse->expectOnce('addHeader', array('Content-Encoding', stubGzipWebsiteCache::X_GZIP)); 
    190         $this->mockResponse->expectCallcount('write', 2); 
    191         $this->mockResponse->expectAt(0, 'write', array(stubGzipWebsiteCache::HEADER)); 
    192         $this->mockResponse->expectAt(1, 'write', array('cachedContents')); 
    193         $this->mockCacheContainer->setReturnValue('get', 'cachedContents'); 
     191     * 
     192     * @test 
     193     */ 
     194    public function retrieveXGzipCompression() 
     195    { 
     196        $this->mockRequest->expects($this->once())->method('acceptsCookies')->will($this->returnValue(true)); 
     197        $this->mockRequest->expects($this->once())->method('validateValue')->will($this->returnValue(true)); 
     198        $this->mockResponse->expects($this->once())->method('addHeader')->with($this->equalTo('Content-Encoding'), $this->equalTo(stubGzipWebsiteCache::X_GZIP)); 
     199        $this->mockResponse->expects($this->at(1)) 
     200                           ->method('write') 
     201                           ->with(($this->equalTo(stubGzipWebsiteCache::HEADER))); 
     202        $this->mockCacheContainer->expects($this->once())->method('get')->will($this->returnValue('cachedContents')); 
    194203        $this->assertTrue($this->gzipWebsiteCache->retrieve($this->mockRequest, $this->mockSession, $this->mockResponse, 'foo')); 
    195         $this->assertEqual($this->gzipWebsiteCache->getMissReason(), ''); 
     204        $this->assertEquals('', $this->gzipWebsiteCache->getMissReason()); 
    196205    } 
    197206 
    198207    /** 
    199208     * assert that gzip cache returns data in correct compression 
    200      */ 
    201     public function testRetrieveGzipCompression() 
    202     { 
    203         $this->mockRequest->setReturnValue('acceptsCookies', true); 
    204         $this->mockRequest->setReturnValueAt(0, 'validateValue', false); 
    205         $this->mockRequest->setReturnValueAt(1, 'validateValue', true); 
    206         $this->mockResponse->expectOnce('addHeader', array('Content-Encoding', stubGzipWebsiteCache::GZIP)); 
    207         $this->mockResponse->expectCallcount('write', 2); 
    208         $this->mockResponse->expectAt(0, 'write', array(stubGzipWebsiteCache::HEADER)); 
    209         $this->mockResponse->expectAt(1, 'write', array('cachedContents')); 
    210         $this->mockCacheContainer->setReturnValue('get', 'cachedContents'); 
     209     * 
     210     * @test 
     211     */ 
     212    public function retrieveGzipCompression() 
     213    { 
     214        $this->mockRequest->expects($this->once())->method('acceptsCookies')->will($this->returnValue(true)); 
     215        $this->mockRequest->expects($this->exactly(2))->method('validateValue')->will($this->onConsecutiveCalls(false, true)); 
     216        $this->mockResponse->expects($this->once())->method('addHeader')->with($this->equalTo('Content-Encoding'), $this->equalTo(stubGzipWebsiteCache::GZIP)); 
     217        $this->mockResponse->expects($this->at(1)) 
     218                           ->method('write') 
     219                           ->with(($this->equalTo(stubGzipWebsiteCache::HEADER))); 
     220        $this->mockCacheContainer->expects($this->once())->method('get')->will($this->returnValue('cachedContents')); 
    211221        $this->assertTrue($this->gzipWebsiteCache->retrieve($this->mockRequest, $this->mockSession, $this->mockResponse, 'foo')); 
    212         $this->assertEqual($this->gzipWebsiteCache->getMissReason(), ''); 
     222        $this->assertEquals('', $this->gzipWebsiteCache->getMissReason()); 
    213223    } 
    214224 
    215225    /** 
    216226     * assert that response data is stored 
    217      */ 
    218     public function testStore() 
    219     { 
    220         $this->mockResponse->setReturnValue('getData', 'fooContent$SIDbla$SESSION_NAMEblub$SESSION_ID'); 
    221         $this->mockWebsiteCache->expectOnce('store', array($this->mockRequest, $this->mockResponse, 'foo')); 
    222         $this->mockWebsiteCache->setReturnValue('store', true); 
    223         $this->mockCacheContainer->expectOnce('put', array('foo', '*')); 
     227     * 
     228     * @test 
     229     */ 
     230    public function store() 
     231  &nbs