Changeset 1455
- Timestamp:
- 03/23/08 01:38:17 (6 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/main/php/net/stubbles/websites/variantmanager/stubVariantsPreInterceptor.php
r1355 r1455 77 77 } 78 78 79 if (null == $variant) {79 if (null === $variant) { 80 80 $variant = $variantFactory->getVariantsMap()->getVariant($session, $request); 81 81 } … … 95 95 * @return stubVariantFactory 96 96 */ 97 // @codeCoverageIgnoreStart 97 98 protected function createVariantFactory($classname) 98 99 { 99 100 return new $classname(); 100 101 } 102 // @codeCoverageIgnoreEnd 101 103 102 104 /** … … 122 124 $cookieVariant = $variantFactory->getVariantByName($variantName); 123 125 $enforcingVariant = $variantFactory->getVariantsMap()->getEnforcingVariant($session, $request); 124 if (null == $enforcingVariant) {126 if (null === $enforcingVariant) { 125 127 return $cookieVariant; 126 128 } trunk/src/test/php/net/stubbles/websites/variantmanager/stubVariantsPreInterceptorCookieVariantTestCase.php
r1269 r1455 12 12 'net::stubbles::websites::variantmanager::types::stubVariant' 13 13 ); 14 /** 15 * Helper class for the test. 16 * 17 * @package stubbles 18 * @subpackage websites_variantmanager_test 19 */ 14 20 class TestVariantsPreInterceptor extends stubVariantsPreInterceptor 15 21 { 22 /** 23 * returns the cookie variant 24 * 25 * @param stubRequest $request 26 * @param stubSession $session 27 * @param stubVariantFactory $variantFactory 28 * @param string $cookieName 29 * @return stubVariant 30 */ 16 31 public function getCookieVariant(stubRequest $request, stubSession $session, stubVariantFactory $variantFactory, $cookieName) 17 32 { 18 33 return $this->getVariantFromCookie($request, $session, $variantFactory, $cookieName); 34 } 35 36 /** 37 * returns the created cookie 38 * 39 * @param string $cookieName 40 * @param string $variantName 41 * @param int $expiring 42 * @param string $cookieURL 43 * @param string $cookiePath 44 * @return stubCookie 45 */ 46 public function callCreateCookie($cookieName, $variantName, $expiring, $cookieURL, $cookiePath) 47 { 48 return $this->createCookie($cookieName, $variantName, $expiring, $cookieURL, $cookiePath); 19 49 } 20 50 } … … 154 184 $this->assertSame($barVariant, $resultVariant); 155 185 } 186 187 /** 188 * make sure cookie is created correct 189 * 190 * @test 191 */ 192 public function createCookie() 193 { 194 $cookie = $this->variantPreInterceptor->callCreateCookie('name', 'value', 3600, 'url', 'path'); 195 $this->assertEquals('name', $cookie->getName()); 196 $this->assertEquals('value', $cookie->getValue()); 197 $this->assertGreaterThan(time() + 3550, $cookie->getExpiration()); 198 $this->assertEquals('url', $cookie->getDomain()); 199 $this->assertEquals('path', $cookie->getPath()); 200 } 156 201 } 157 202 ?>
