Changeset 317
- Timestamp:
- 03/01/07 23:52:08 (2 years ago)
- Files:
-
- trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/websites/stubAbstractPageElement.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/websites/stubPageElement.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/websites/xml/stubXMLProcessor.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisProcessorTestCase.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/websites/memphis/stubSimpleHTMLMemphisPageElementTestCase.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/websites/xml/stubXMLProcessorTestCase.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php
r315 r317 57 57 foreach ($elements as $name => $element) { 58 58 $prefixRequest->setPrefix($name); 59 if ($element->isAvailable($prefixRequest, $this->session, $this->response) == false) { 60 continue; 61 } 62 59 63 $element->process($prefixRequest, $this->session, $this->response); 60 64 } trunk/src/main/php/net/stubbles/websites/stubAbstractPageElement.php
r288 r317 42 42 return $this->name; 43 43 } 44 45 /** 46 * checks whether the page element is available or not 47 * 48 * @param stubRequest $request the request data 49 * @param stubSession $session current session 50 * @param stubResponse $response contains response data 51 * @return bool 52 */ 53 public function isAvailable(stubRequest $request, stubSession $session, stubResponse $response) 54 { 55 return true; 56 } 44 57 } 45 58 ?> trunk/src/main/php/net/stubbles/websites/stubPageElement.php
r267 r317 32 32 */ 33 33 public function getName(); 34 35 /** 36 * checks whether the page element is available or not 37 * 38 * @param stubRequest $request the request data 39 * @param stubSession $session current session 40 * @param stubResponse $response contains response data 41 * @return bool 42 */ 43 public function isAvailable(stubRequest $request, stubSession $session, stubResponse $response); 34 44 35 45 /** trunk/src/main/php/net/stubbles/websites/xml/stubXMLProcessor.php
r315 r317 62 62 foreach ($elements as $name => $element) { 63 63 $prefixRequest->setPrefix($name); 64 if ($element->isAvailable($prefixRequest, $this->session, $this->response) == false) { 65 continue; 66 } 67 64 68 $data = $element->process($prefixRequest, $this->session, $this->response); 65 69 $xmlSerializer->serialize($data, $xmlStreamWriter, array(stubXMLSerializer::OPT_ROOT_TAG => $name)); trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisProcessorTestCase.php
r315 r317 97 97 $pageElement1 = new MockstubPageElement(); 98 98 $response = $this->memphisProcessor->getResponse(); 99 $pageElement1->setReturnValue('isAvailable', true); 99 100 $pageElement1->expectOnce('process'); 100 101 $pageElement2 = new MockstubPageElement(); 102 $pageElement2->setReturnValue('isAvailable', true); 101 103 $pageElement2->expectOnce('process'); 102 $this->mockPage->setReturnValue('getElements', array('foo' => $pageElement1, 'bar' => $pageElement2)); 104 $pageElement3 = new MockstubPageElement(); 105 $pageElement3->setReturnValue('isAvailable', false); 106 $pageElement3->expectNever('process'); 107 $this->mockPage->setReturnValue('getElements', array('foo' => $pageElement1, 'bar' => $pageElement2, 'baz' => $pageElement3)); 103 108 $return = $this->memphisProcessor->process(); 104 109 $this->assertReference($this->memphisProcessor, $return); trunk/src/test/php/net/stubbles/websites/memphis/stubSimpleHTMLMemphisPageElementTestCase.php
r289 r317 76 76 77 77 /** 78 * assure that a simple html memphis page element is always available 79 */ 80 public function testIsAvailable() 81 { 82 $this->assertTrue($this->simpleHTMLMemphisPageElement->isAvailable($this->mockRequest, $this->mockSession, $this->mockResponse)); 83 } 84 85 /** 78 86 * assure that processing works as expected 79 87 */ trunk/src/test/php/net/stubbles/websites/xml/stubXMLProcessorTestCase.php
r315 r317 143 143 $pageElement1->setReturnValue('getName', 'foo'); 144 144 $pageElement1->setReturnValue('process', 'foo'); 145 $pageElement1->setReturnValue('isAvailable', true); 145 146 $pageElement1->expectOnce('process'); 146 147 $pageElement2 = new MockstubPageElement(); 147 148 $pageElement2->setReturnValue('getName', 'bar'); 148 149 $pageElement2->setReturnValue('process', 'bar'); 150 $pageElement2->setReturnValue('isAvailable', true); 149 151 $pageElement2->expectOnce('process'); 152 $pageElement3 = new MockstubPageElement(); 153 $pageElement3->setReturnValue('getName', 'baz'); 154 $pageElement3->setReturnValue('process', 'baz'); 155 $pageElement3->setReturnValue('isAvailable', false); 156 $pageElement3->expectNever('process'); 150 157 $this->page->addElement($pageElement1); 151 158 $this->page->addElement($pageElement2); 159 $this->page->addElement($pageElement3); 152 160 $this->mockXMLStreamWriter->expectCallcount('writeStartElement', 4); 153 161 $this->mockXMLStreamWriter->expectCallcount('writeEndElement', 4);
