Changeset 1518

Timestamp:

04/06/08 19:13:02 (1 month ago)

Author:

mikey

Message:

fix bug: stop processing the request if a xml generator cancelled the request

Files:

• trunk/src/main/php/net/stubbles/websites/xml/stubXMLProcessor.php (modified) (1 diff)
• trunk/src/test/php/net/stubbles/websites/xml/stubXMLProcessorTestCase.php (modified) (2 diffs)

trunk/src/main/php/net/stubbles/websites/xml/stubXMLProcessor.php

@@ -152 +152 @@
-        foreach ($this->xmlGenerators as $xmlGenerator) {
-            $xmlGenerator->generate($xmlStreamWriter, $xmlSerializer);
+            if ($this->request->isCancelled() === true) {
+                return;
+            }
-        }
-

trunk/src/test/php/net/stubbles/websites/xml/stubXMLProcessorTestCase.php

@@ -184 +184 @@
-   public function processSuccessful()
-    {
+        $this->mockRequest->expects($this->exactly(3))
+                          ->method('isCancelled')
+                          ->will($this->returnValue(false));
-        $mockXMLGenerator = $this->getMock('stubXMLGenerator');
-        $this->mockInjector->expects($this->exactly(3))->method('getInstance')->will($this->returnValue($mockXMLGenerator));
@@ -212 +215 @@
-        $this->xmlProcessor->process();
-    }
+
+    /**
+     * assure that processing works as expected
+     *
+     * @test
+     */
+   public function processCancelledByGenerator()
+    {
+        $this->mockRequest->expects($this->once())
+                          ->method('isCancelled')
+                          ->will($this->returnValue(true));
+        $mockXMLGenerator = $this->getMock('stubXMLGenerator');
+        $this->mockInjector->expects($this->exactly(3))->method('getInstance')->will($this->returnValue($mockXMLGenerator));
+        $mockXMLGenerator->expects($this->once())->method('generate')->with($this->equalTo($this->mockXMLStreamWriter), $this->equalTo($this->mockXMLSerializer));
+        $this->xmlProcessor->expects($this->once())->method('createXMLStreamWriter')->will($this->returnValue($this->mockXMLStreamWriter));
+        $this->xmlProcessor->expects($this->once())->method('createXMLSerializer')->will($this->returnValue($this->mockXMLSerializer));
+        $this->xmlProcessor->expects($this->never())->method('createSkinGenerator');
+        $this->xmlProcessor->expects($this->never())->method('createXSLProcessor');
+        $this->mockXMLStreamWriter->expects($this->never())->method('asDOM');
+        $this->mockXMLStreamWriter->expects($this->never())->method('asXML');
+        $this->mockSession->expects($this->never())->method('putValue');
+        $this->mockResponse->expects($this->never())->method('replaceData');
+        $this->xmlProcessor->process();
+    }
-}
-?>