Changeset 1432

Show
Ignore:
Timestamp:
03/17/08 22:29:51 (4 months ago)
Author:
mikey
Message:

removed session token from overall availability: should be added as session resource if necessary

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/websites/xml/generator/stubSessionXMLGenerator.php

    r1423 r1432  
    2929 *       <alias>bar</alias> 
    3030 *     </variant> 
    31  *     <token> 
    32  *       <current>foo</current> 
    33  *       <next>bar</next> 
    34  *     </token> 
    3531 *   </session> 
    3632 *   [...] 
    …… 
    9288        $xmlStreamWriter->writeElement('alias', array(), (string) $this->session->getValue('net.stubbles.websites.variantmanager.variant.alias')); 
    9389        $xmlStreamWriter->writeEndElement();  // end variant 
    94         $xmlStreamWriter->writeStartElement('token'); 
    95         $xmlStreamWriter->writeElement('current', array(), $this->session->getCurrentToken()); 
    96         $xmlStreamWriter->writeElement('next', array(), $this->session->getNextToken()); 
    97         $xmlStreamWriter->writeEndElement();  // end token 
    9890        $xmlStreamWriter->writeEndElement();  // end session 
    9991    } 

  • trunk/src/test/php/net/stubbles/websites/xml/generator/stubSessionXMLGeneratorTestCase.php

    r1423 r1432  
    7373        $this->mockSession->expects($this->once())->method('isNew')->will($this->returnValue(true)); 
    7474        $this->mockSession->expects($this->exactly(2))->method('getValue')->will($this->onConsecutiveCalls('variant_name', 'variant_alias')); 
    75         $this->mockSession->expects($this->once())->method('getCurrentToken')->will($this->returnValue('bar')); 
    76         $this->mockSession->expects($this->once())->method('getNextToken')->will($this->returnValue('baz')); 
    7775        $this->requestXMLGenerator->generate($this->xmlStreamWriter, $this->mockXMLSerializer); 
    7876        $doc = $this->xmlStreamWriter->asXML(); 
    …… 
    8785    '<alias>variant_alias</alias>' .  
    8886  '</variant>' .  
    89   '<token>' .  
    90     '<current>bar</current>' .  
    91     '<next>baz</next>' .  
    92   '</token>' .  
    9387'</session>', $doc); 
    9488    } 
    …… 
    106100        $this->mockSession->expects($this->once())->method('isNew')->will($this->returnValue(false)); 
    107101        $this->mockSession->expects($this->exactly(2))->method('getValue')->will($this->returnValue(null)); 
    108         $this->mockSession->expects($this->once())->method('getCurrentToken')->will($this->returnValue('bar')); 
    109         $this->mockSession->expects($this->once())->method('getNextToken')->will($this->returnValue('baz')); 
    110102        $this->requestXMLGenerator->generate($this->xmlStreamWriter, $this->mockXMLSerializer); 
    111103        $doc = $this->xmlStreamWriter->asXML(); 
    …… 
    120112    '<alias></alias>' .  
    121113  '</variant>' .  
    122   '<token>' .  
    123     '<current>bar</current>' .  
    124     '<next>baz</next>' .  
    125   '</token>' .  
    126114'</session>', $doc); 
    127115    }