Changeset 523

Show
Ignore:
Timestamp:
04/14/07 18:23:26 (1 year ago)
Author:
mikey
Message:

added net.stubbles.websites.variantmanager.types.stubVariant::getFullQualifiedName()
net.stubbles.websites.variantmanager.stubVariantsPreInterceptor only stores full qualified variant name in session

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/websites/variantmanager/stubVariantsPreInterceptor.php

    r493 r523  
    8080        } 
    8181         
    82         $session->putValue('net.stubbles.websites.variantmanager.variant', $variant); 
     82        $session->putValue('net.stubbles.websites.variantmanager.variant', $variant->getFullQualifiedName()); 
    8383        $expiring   = stubRegistry::getConfig('net.stubbles.websites.variantmanager.cookie.expiring', (86400 * 90)); // 90 days default 
    8484        $cookieURL  = stubRegistry::getConfig('net.stubbles.websites.variantmanager.cookie.url', null); 

  • trunk/src/main/php/net/stubbles/websites/variantmanager/types/stubAbstractVariant.php

    r328 r523  
    7575     
    7676    /** 
     77     * returns the full qualified name of the variant 
     78     * 
     79     * @return  string 
     80     */ 
     81    public function getFullQualifiedName() 
     82    { 
     83        if ($this->hasParent() == true) { 
     84            return $this->parent->getFullQualifiedName() . ':' . $this->name; 
     85        } 
     86         
     87        return $this->name; 
     88    } 
     89     
     90    /** 
    7791     * sets the name of the variant 
    7892     * 

  • trunk/src/main/php/net/stubbles/websites/variantmanager/types/stubVariant.php

    r328 r523  
    2525     */ 
    2626    public function getName(); 
     27     
     28    /** 
     29     * returns the full qualified name of the variant 
     30     * 
     31     * @return  string 
     32     */ 
     33    public function getFullQualifiedName(); 
    2734     
    2835    /** 

  • trunk/src/test/php/net/stubbles/websites/variantmanager/stubVariantsPreInterceptorProcessTestCase.php

    r473 r523  
    113113        $mockVariant = new MockstubVariant(); 
    114114        $mockVariant->setReturnValue('getName', 'variantName'); 
     115        $mockVariant->setReturnValue('getFullQualifiedName', 'foo:variantName'); 
    115116        $this->mockSession->setReturnValue('hasValue', false); 
    116         $this->mockSession->expectOnce('putValue', array('net.stubbles.websites.variantmanager.variant', $mockVariant)); 
     117        $this->mockSession->expectOnce('putValue', array('net.stubbles.websites.variantmanager.variant', 'foo:variantName')); 
    117118        $this->mockResponse->expectOnce('setCookie'); 
    118119        $this->mockRequest->setReturnValue('hasValue', false); 
    …… 
    134135        $mockNewVariant = new MockstubVariant(); 
    135136        $mockNewVariant->setReturnValue('getName', 'new'); 
     137        $mockNewVariant->setReturnValue('getFullQualifiedName', 'foo:new'); 
    136138        $mockCookieVariant = new MockstubVariant(); 
    137139        $mockCookieVariant->setReturnValue('getName', 'cookie'); 
     140        $mockCookieVariant->setReturnValue('getFullQualifiedName', 'foo:cookie'); 
    138141        $this->mockSession->setReturnValue('hasValue', false); 
    139         $this->mockSession->expectOnce('putValue', array('net.stubbles.websites.variantmanager.variant', $mockNewVariant)); 
     142        $this->mockSession->expectOnce('putValue', array('net.stubbles.websites.variantmanager.variant', 'foo:new')); 
    140143        $this->mockResponse->expectOnce('setCookie'); 
    141144        $this->mockRequest->setReturnValue('hasValue', false); 
    …… 
    159162        $mockNewVariant = new MockstubVariant(); 
    160163        $mockNewVariant->setReturnValue('getName', 'new'); 
     164        $mockNewVariant->setReturnValue('getFullQualifiedName', 'foo:new'); 
    161165        $mockCookieVariant = new MockstubVariant(); 
    162166        $mockCookieVariant->setReturnValue('getName', 'cookie'); 
     167        $mockCookieVariant->setReturnValue('getFullQualifiedName', 'foo:cookie'); 
    163168        $this->mockSession->setReturnValue('hasValue', false); 
    164         $this->mockSession->expectOnce('putValue', array('net.stubbles.websites.variantmanager.variant', $mockCookieVariant)); 
     169        $this->mockSession->expectOnce('putValue', array('net.stubbles.websites.variantmanager.variant', 'foo:cookie')); 
    165170        $this->mockResponse->expectOnce('setCookie'); 
    166171        $this->mockRequest->setReturnValue('hasValue', false); 

  • trunk/src/test/php/net/stubbles/websites/variantmanager/types/stubAbstractVariantTestCase.php

    r328 r523  
    7878    { 
    7979        $this->assertEqual($this->abstractVariant->getName(), ''); 
     80        $this->assertEqual($this->abstractVariant->getFullQualifiedName(), ''); 
    8081        $this->abstractVariant->setName('foo'); 
    8182        $this->assertEqual($this->abstractVariant->getName(), 'foo'); 
     83        $this->assertEqual($this->abstractVariant->getFullQualifiedName(), 'foo'); 
    8284        $this->expectException('stubVariantConfigurationException'); 
    8385        $this->abstractVariant->setName('foobarbazfoobarbaz'); 
    …… 
    218220        $parent->expect('assign', array($this->mockSession, $this->mockRequest)); 
    219221        $this->assertTrue($this->abstractVariant->assign($this->mockSession, $this->mockRequest)); 
     222        $this->abstractVariant->setName('bar'); 
     223        $parent->setReturnValue('getFullQualifiedName', 'foo'); 
     224        $this->assertEqual($this->abstractVariant->getFullQualifiedName(), 'foo:bar'); 
    220225    } 
    221226}