tests

Author: Dave

build/tests/phpunit/RPSNewCoreControlClassTest.php

@@ -6,21 +6,31 @@ class RPSNewCoreControlClassTest extends PHPUnit_Framework_TestCase {
 
     public function setUp() {
         require_once("bootstrap.php");
-        $this->availableControls = array("Game", "Page");
+        $this->availableControls = array("Game");
     }
 
     public function testexecuteControlReturnsAnArray() {
+
+        $mockPageVars = array();
+        $mockPageVars["route"] = array();
+        $mockPageVars["route"]["action"] = "home";
+
         $control = new Core\Control() ;
         foreach ($this->availableControls as $availableControl) {
-            $currentControlOutput = $control->executeControl($availableControl, array() );
+            $currentControlOutput = $control->executeControl($availableControl, $mockPageVars);
             $this->assertTrue( is_array($currentControlOutput) );
         }
     }
 
     public function testexecuteControlReturnsAnArrayOfCorrectStructure() {
+
+        $mockPageVars = array();
+        $mockPageVars["route"] = array();
+        $mockPageVars["route"]["action"] = "home";
+
         $control = new Core\Control() ;
         foreach ($this->availableControls as $availableControl) {
-            $currentControlOutput = $control->executeControl($availableControl, array());
+            $currentControlOutput = $control->executeControl($availableControl, $mockPageVars );
             $this->assertTrue( array_key_exists("view", $currentControlOutput) );
             $this->assertTrue( array_key_exists("pageVars", $currentControlOutput) );
         }

build/tests/phpunit/RPSNewCoreViewClassTest.php

@@ -11,8 +11,7 @@ public function setUp() {
         $this->listOfViews = array("index", "login", "register");
         $this->viewVars = array(
             "view"=>"index",
-            "pageVars"=>array()
-        );
+            "pageVars"=>array() );
         $this->executeViewStoreTheOutput();
     }
 

src/Controller/Game.php

@@ -5,7 +5,6 @@
 class Game extends Base {
 
     public function execute($pageVars) {
-        var_dump($pageVars);
         if ( $pageVars["route"]["action"] == "home" ) {
             return array ("type"=>"view", "view"=>"gameIntro", "pageVars"=>$this->content); }
         if ( $pageVars["route"]["action"] == "choosePlayers" ) {
@@ -15,7 +14,6 @@ public function execute($pageVars) {
                 $this->processGame();
                 return array ("type"=>"view", "view"=>"gameComplete", "pageVars"=>$this->content); }
             return array ("type"=>"view", "view"=>"gameChoosePlayers", "pageVars"=>$this->content); }
-        echo "im here";
         return array ("type"=>"view", "view"=>"gameIntro", "pageVars"=>$this->content);
     }
 

src/Core/Control.php

@@ -8,7 +8,6 @@ public function executeControl($control, $pageVars) {
         $className = '\\Controller\\'.ucfirst($control);
         $controlObject = new $className;
         $executionResult = $controlObject->execute($pageVars);
-        var_dump ( "x res", $executionResult);
         return $executionResult;
     }
 

src/Model/PageFactory.php

@@ -11,7 +11,7 @@ public function getPageModel($page) {
 
     private function getModelNameFromPage($page) {
         $pages = array("full-cv"=>"FullCV", "juicy-bits"=>"JuicyCV", "hi"=>"Hi" );
-        $modelName = $pages[$page];
+        $modelName = (isset($pages[$page])) ? $pages[$page] : null;
         $className = "\Model\\".$modelName.'Page' ;
         return new $className;
     }