Changeset 1533

Timestamp:

04/12/08 18:35:23 (1 month ago)

Author:

mikey

Message:

stop further processing if request already canceled

Files:

• trunk/src/main/php/net/stubbles/websites/stubFrontController.php (modified) (1 diff)
• trunk/src/test/php/net/stubbles/websites/stubFrontControllerTestCase.php (modified) (4 diffs)

trunk/src/main/php/net/stubbles/websites/stubFrontController.php

@@ -116 +116 @@
-    public function process()
-    {
+        if ($this->request->isCancelled() === true) {
+            $this->response->send();
+            return;
+        }
+        
-        $processorResolverFactory = $this->websiteInitializer->getProcessorResolverFactory();
-        $processorResolverFactory->init();

trunk/src/test/php/net/stubbles/websites/stubFrontControllerTestCase.php

@@ -150 +150 @@
-     * @test
-     */
+    public function processWithAlreadyCancelledRequest()
+    {
+        $this->mockRequest->expects($this->once())->method('isCancelled')->will($this->returnValue(true));
+        $this->mockResponse->expects($this->once())->method('send');
+        $this->mockProcessor->expects($this->never())->method('forceSSL');
+        $this->mockInterceptorInitializer->expects($this->never())->method('getPreInterceptors');
+        $this->mockInterceptorInitializer->expects($this->never())->method('getPostInterceptors');
+        $this->mockProcessor->expects($this->never())->method('getInterceptorDescriptor');
+        $this->mockProcessor->expects($this->never())->method('process');
+        $this->mockWebsiteCacheFactory->expects($this->never())->method('configure');
+        $this->frontController->setWebsiteCacheFactory($this->mockWebsiteCacheFactory);
+        $this->frontController->process();
+    }
+
+    /**
+     * assure that processing ends when request is cancelled
+     *
+     * @test
+     */
-    public function processWithPreInterceptorCancellingRequest()
-    {
@@ -161 +180 @@
-                                         ->will($this->returnValue(array($preInterceptor1, $preInterceptor2)));
-        $this->mockInterceptorInitializer->expects($this->never())->method('getPostInterceptors');
-once())->method('isCancelled')->will($this->returnValue(
+exactly(2))->method('isCancelled')->will($this->onConsecutiveCalls(false, 
-        $this->mockResponse->expects($this->once())->method('send');
-        $this->mockProcessor->expects($this->once())
@@ -189 +208 @@
-        $this->mockInterceptorInitializer->expects($this->never())
-                                         ->method('getPostInterceptors');
-once())->method('isCancelled')->will($this->returnValue(
+exactly(2))->method('isCancelled')->will($this->onConsecutiveCalls(false, 
-        $this->mockProcessor->expects($this->any())->method('process');
-        $this->mockResponse->expects($this->once())->method('send');
@@ -213 +232 @@
-                                         ->method('getPostInterceptors')
-                                         ->will($this->returnValue(array($postInterceptor1, $postInterceptor2)));
-2
+3
-                          ->method('isCancelled')
-
+false, 
-        $this->mockProcessor->expects($this->any())->method('process');
-        $this->mockResponse->expects($this->once())->method('send');