Changeset 1447

Timestamp:

03/22/08 23:18:11 (2 months ago)

Author:

mikey

Message:

refactoring #137, part 8 (and final): updated tests

Files:

• trunk/src/main/php/net/stubbles/websites/processors/stubAbstractProcessorResolver.php (modified) (3 diffs)
• trunk/src/main/php/net/stubbles/websites/processors/stubDefaultProcessorResolver.php (modified) (6 diffs)
• trunk/src/main/php/net/stubbles/websites/processors/stubSimpleProcessorResolver.php (modified) (2 diffs)
• trunk/src/main/php/org/stubbles/test/FooPageBasedProcessor.php (added)
• trunk/src/test/php/net/stubbles/websites/processors/stubAbstractProcessorResolverTestCase.php (modified) (2 diffs)
• trunk/src/test/php/net/stubbles/websites/processors/stubDefaultProcessorResolverTestCase.php (modified) (7 diffs)
• trunk/src/test/php/net/stubbles/websites/processors/stubSimpleProcessorResolverTestCase.php (modified) (2 diffs)

trunk/src/main/php/net/stubbles/websites/processors/stubAbstractProcessorResolver.php

@@ -68 +68 @@
-
-    /**
-     * returns the page factory class for the processor
-     *
-     * @param   stubProcessor  $processor
-     * @return  string
-     */
-    protected abstract function getPageFactoryClass(stubProcessor $processor);
-
-    /**
-     * helper method to handle page based processors
-     *
@@ -93 +85 @@
-        }
-        
-        stubClassLoader::load($pageFactoryClass);
-        $nqClassName = stubClassLoader::getNonQualifiedClassName($pageFactoryClass);
+        if (class_exists($nqClassName, false) === false) {
+            stubClassLoader::load($pageFactoryClass);
+        }
+        
-        $pageFactory = new $nqClassName();
-        if (($pageFactory instanceof stubPageFactory) === false) {
@@ -102 +97 @@
-        $processor->selectPage($pageFactory);
-    }
+
+    /**
+     * returns the page factory class for the processor
+     *
+     * @param   stubProcessor  $processor
+     * @return  string
+     */
+    protected abstract function getPageFactoryClass(stubProcessor $processor);
-}
-?>

trunk/src/main/php/net/stubbles/websites/processors/stubDefaultProcessorResolver.php

@@ -2 +2 @@
-/**
- * Default implementation for the processor resolver.
- 
+
- * @author      Frank Kleine <mikey@stubbles.net>
- * @package     stubbles
@@ -13 +13 @@
-/**
- * Default implementation for the processor resolver.
+ *
+ * The default processor resolver is able to select the processor to be used
+ * for the current request depending on the request parameter <em>processor</em>.
+ * For instance, if you add a processor with
+ * <code>
+ *   $defaultProcessor->addProcessor('foo', 'org::stubbles::test::FooProcessor');
+ *   $defaultProcessor->addProcessor('bar', 'org::stubbles::test::BarProcessor');
+ * </code>
+ * then the first added processor class named as second argument will be
+ * selected if the value of the request param is <em>foo</em>.
+ *
+ * To make sure that a processor gets selected even in case the parameter is not
+ * set or has a wrong value, one can set the default processor to be used:
+ * <code>
+ *   $defaultProcessor->setDefaultProcessor('foo');
+ * </code>
+ * Now, the processor with this key will be selected in such cases as well. You
+ * should make sure that the default processor matches one of the added
+ * processors, else an exception will be thrown.
- * 
-
+
+
+
+
+
+
+
+
+
- * @package     stubbles
- * @subpackage  websites_processors
@@ -53 +80 @@
-     * @param  string  $pageFactoryClass       optional  page factory class for the processor
-     */
-'interceptors'
+null
-    {
-
-
+
+
+
+
+
+
+
-        if (null !== $pageFactoryClass) {
-            $this->pageFactoryClasses[$fqClassName] = $pageFactoryClass;
@@ -83 +115 @@
-    protected function doResolve(stubRequest $request, stubSession $session, stubResponse $response)
-    {
-
-
+
+
+
-        }
-        
-
+
+
+
+
+
-            $paramValue = $this->defaultProcessor;
-        } else {
-            $paramValue = $request->getValidatedValue(new stubPreSelectValidator(array_keys($this->processors)), 'processor');
-            if (null == $paramValue) {
-                $paramValue = $this->defaultProcessor;
-            }
-        }
-
-::stubbles::
+    
+.stubbles.
-        return $this->processors[$paramValue];
-    }
@@ -107 +139 @@
-    protected function configure(stubProcessor $processor)
-    {
-
-
+
+
+
-        }
-    }
@@ -120 +153 @@
-    protected function getPageFactoryClass(stubProcessor $processor)
-    {
-
-
+
+
+
-        }
-        

trunk/src/main/php/net/stubbles/websites/processors/stubSimpleProcessorResolver.php

@@ -1 +1 @@
-<?php
-/**
-
-
+
+
+
- * @author      Frank Kleine <mikey@stubbles.net>
- * @package     stubbles
@@ -9 +10 @@
-stubClassLoader::load('net::stubbles::websites::processors::stubAbstractProcessorResolver');
-/**
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- * @package     stubbles
- * @subpackage  websites_processors

trunk/src/test/php/net/stubbles/websites/processors/stubAbstractProcessorResolverTestCase.php

@@ -92 +92 @@
-     * @test
-     */
-
+NonPageBased
-    {
-        $this->abstractProcessorResolver->expects($this->once())
@@ -100 +100 @@
-        $processor = $this->abstractProcessorResolver->resolve($this->mockRequest, $this->mockSession, $this->mockResponse);
-        $this->assertType('FooProcessor', $processor);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}

trunk/src/test/php/net/stubbles/websites/processors/stubDefaultProcessorResolverTestCase.php

@@ -29 +29 @@
-        return $this->doResolve($request, $session, $response);
-    }
+
+    /**
+     * direct access to configure()
+     *
+     * @param  stubProcessor  $processor
+     */
+    public function callConfigure(stubProcessor $processor)
+    {
+        $this->configure($processor);
+    }
+
+    /**
+     * direct access to getPageFactoryClass()
+     *
+     * @param   stubProcessor  $processor
+     * @return  string
+     */
+    public function callGetPageFactoryClass(stubProcessor $processor)
+    {
+        return $this->getPageFactoryClass($processor);
+    }
-}
-/**
@@ -79 +100 @@
-    protected function addProcessors()
-    {
-
-'interceptors-bar
-, 'interceptors-baz'
+, 'TestPageFactoryClassName1'
+null, 'TestPageFactoryClassName2
+
-        $this->defaultProcessorResolver->setDefaultProcessor('foo');
-    }
@@ -94 +115 @@
-        $this->addProcessors();
-        $this->mockRequest->expects($this->once())->method('hasValue')->will($this->returnValue(false));
+        $this->mockSession->expects($this->once())
+                          ->method('putValue')
+                          ->with($this->equalTo('net.stubbles.websites.lastProcessor'), $this->equalTo('foo'));
-        $processor = $this->defaultProcessorResolver->getDoResolveReturnValue($this->mockRequest, $this->mockSession, $this->mockResponse);
-        $this->assertEquals('org::stubbles::test::FooProcessor', $processor);
@@ -108 +132 @@
-        $this->mockRequest->expects($this->once())->method('hasValue')->will($this->returnValue(true));
-        $this->mockRequest->expects($this->once())->method('getValidatedValue')->will($this->returnValue('bar'));
+        $this->mockSession->expects($this->once())
+                          ->method('putValue')
+                          ->with($this->equalTo('net.stubbles.websites.lastProcessor'), $this->equalTo('bar'));
-        $processor = $this->defaultProcessorResolver->getDoResolveReturnValue($this->mockRequest, $this->mockSession, $this->mockResponse);
-        $this->assertEquals('org::stubbles::test::BarProcessor', $processor);
@@ -122 +149 @@
-        $this->mockRequest->expects($this->once())->method('hasValue')->will($this->returnValue(true));
-        $this->mockRequest->expects($this->once())->method('getValidatedValue')->will($this->returnValue(null));
+        $this->mockSession->expects($this->once())
+                          ->method('putValue')
+                          ->with($this->equalTo('net.stubbles.websites.lastProcessor'), $this->equalTo('foo'));
-        $processor = $this->defaultProcessorResolver->getDoResolveReturnValue($this->mockRequest, $this->mockSession, $this->mockResponse);
-        $this->assertEquals($processor, 'org::stubbles::test::FooProcessor');
@@ -134 +164 @@
-    public function noProcessors()
-    {
+        $this->mockSession->expects($this->never())->method('putValue');
-        $this->defaultProcessorResolver->getDoResolveReturnValue($this->mockRequest, $this->mockSession, $this->mockResponse);
-    }
@@ -147 +178 @@
-        $this->defaultProcessorResolver->addProcessor('foo', 'org::stubbles::test::FooProcessor', 'interceptors-foo');
-        $this->defaultProcessorResolver->setDefaultProcessor('bar');
+        $this->mockSession->expects($this->never())->method('putValue');
-        $this->defaultProcessorResolver->getDoResolveReturnValue($this->mockRequest, $this->mockSession, $this->mockResponse);
+    }
+
+    /**
+     * processor should be condigured correctly
+     *
+     * @test
+     */
+    public function processorIsConfiguredCorrectly()
+    {
+        $this->addProcessors();
+        $mockProcessor = $this->getMock('stubProcessor');
+        $mockProcessor->expects($this->once())
+                      ->method('getClassName')
+                      ->will($this->returnValue('org::stubbles::test::FooProcessor'));
+        $mockProcessor->expects($this->once())->method('setInterceptorDescriptor')->with($this->equalTo('interceptors-foo'));
+        $this->defaultProcessorResolver->callConfigure($mockProcessor);
+        $mockProcessor = $this->getMock('stubProcessor');
+        $mockProcessor->expects($this->once())
+                      ->method('getClassName')
+                      ->will($this->returnValue('org::stubbles::test::BarProcessor'));
+        $mockProcessor->expects($this->once())->method('setInterceptorDescriptor')->with($this->equalTo('interceptors'));
+        $this->defaultProcessorResolver->callConfigure($mockProcessor);
+        $mockProcessor = $this->getMock('stubProcessor');
+        $mockProcessor->expects($this->once())
+                      ->method('getClassName')
+                      ->will($this->returnValue('org::stubbles::test::BazProcessor'));
+        $mockProcessor->expects($this->once())->method('setInterceptorDescriptor')->with($this->equalTo('interceptors'));
+        $this->defaultProcessorResolver->callConfigure($mockProcessor);
+    }
+
+    /**
+     * page factory class should be handled correct
+     *
+     * @test
+     */
+    public function pageFactoryClass()
+    {
+        $this->addProcessors();
+        $mockProcessor = $this->getMock('stubProcessor');
+        $mockProcessor->expects($this->exactly(3))
+                      ->method('getClassName')
+                      ->will($this->onConsecutiveCalls('org::stubbles::test::FooProcessor',
+                                                       'org::stubbles::test::BarProcessor',
+                                                       'org::stubbles::test::BazProcessor'
+                             )
+                        );
+        $this->assertEquals('TestPageFactoryClassName1', $this->defaultProcessorResolver->callGetPageFactoryClass($mockProcessor));
+        $this->assertEquals('TestPageFactoryClassName2', $this->defaultProcessorResolver->callGetPageFactoryClass($mockProcessor));
+        $this->assertNull($this->defaultProcessorResolver->callGetPageFactoryClass($mockProcessor));
-    }
-}

trunk/src/test/php/net/stubbles/websites/processors/stubSimpleProcessorResolverTestCase.php

@@ -28 +28 @@
-    {
-        return $this->doResolve($request, $session, $response);
+    }
+
+    /**
+     * direct access to configure()
+     *
+     * @param  stubProcessor  $processor
+     */
+    public function callConfigure(stubProcessor $processor)
+    {
+        $this->configure($processor);
+    }
+
+    /**
+     * direct access to getPageFactoryClass()
+     *
+     * @param   stubProcessor  $processor
+     * @return  string
+     */
+    public function callGetPageFactoryClass(stubProcessor $processor)
+    {
+        return $this->getPageFactoryClass($processor);
-    }
-}
@@ -85 +106 @@
-        $this->assertEquals('org::stubbles::test::FooProcessor', $processor);
-    }
+
+    /**
+     * processor should be condigured correctly
+     *
+     * @test
+     */
+    public function processorIsConfiguredCorrectly()
+    {
+        $mockProcessor = $this->getMock('stubProcessor');
+        $mockProcessor->expects($this->once())->method('setInterceptorDescriptor')->with($this->equalTo('interceptors'));
+        $this->simpleProcessorResolver->callConfigure($mockProcessor);
+    }
+
+    /**
+     * page factory class should be handled correct
+     *
+     * @test
+     */
+    public function pageFactoryClass()
+    {
+        $this->simpleProcessorResolver->setPageFactoryClass('TestPageFactoryClassName');
+        $this->assertEquals('TestPageFactoryClassName', $this->simpleProcessorResolver->callGetPageFactoryClass($this->getMock('stubProcessor')));
+    }
-}
-?>