Added in fix to complete coverages (#16)

* Railsbank config test * Railsbank test and configuration test * No mode test * Added in Railsbank command test
levelfiveteam · Aug 20, 2019 · cc78a17 · cc78a17
1 parent 2511a70
commit cc78a17
Show file tree

Hide file tree

Showing 21 changed files with 474 additions and 85 deletions.
diff --git a/config/railsbank.config.php b/config/railsbank.config.php
@@ -31,6 +31,7 @@
     'commands' => [
         Query\Version\GetVersion::class => QueryHandler\Version\GetVersionHandler::class,
         Query\Me\Information::class => QueryHandler\Me\InformationHandler::class,
+        Query\Me\PHPVersion::class => QueryHandler\Me\PHPVersionHandler::class,
         Query\Customer\GetLedger::class => QueryHandler\Customer\GetLedgerHandler::class,
         Query\Customer\GetLedgers::class => QueryHandler\Customer\GetLedgersHandler::class,
         Query\Customer\GetEndusers::class => QueryHandler\Customer\GetEndusersHandler::class,

diff --git a/src/ConfigServiceFactory.php b/src/ConfigServiceFactory.php
@@ -65,9 +65,8 @@ public function getConfigService() :? Config
     private function validateConfig(Config $config) :? bool
     {
         $railsbankConfigValidator = new RailsbankConfigValidator();
-        return $railsbankConfigValidator->validateConfig(
-            $this->getRailsbankConfiguration($config)
-        );
+        $railsbankConfig = $this->getRailsbankConfiguration($config);
+        return $railsbankConfigValidator->validateConfig($railsbankConfig);
     }
 
     /**
@@ -78,10 +77,10 @@ private function validateConfig(Config $config) :? bool
      */
     private function getRailsbankConfiguration(Config $config) :? Config
     {
-        if (! $config = $config->offsetGet('railsbank_configuration')) {
+        if (! $config->offsetExists('railsbank_configuration')) {
             throw new RailsbankConfigurationMissingException();
         }
 
-        return $config;
+        return $config->offsetGet('railsbank_configuration');
     }
 }
diff --git a/src/Exception/InvalidConfigException.php b/src/Exception/InvalidConfigException.php
@@ -6,6 +6,6 @@ class InvalidConfigException extends \Exception
 {
     public function __construct()
     {
-        parent::__construct('Configuration not valid, refer to documentation', 500);
+        parent::__construct('Configuration not valid, refer to documentation.', 500);
     }
 }
diff --git a/src/Exception/RailsbankConfigurationMissingException.php b/src/Exception/RailsbankConfigurationMissingException.php
@@ -2,16 +2,14 @@
 
 namespace Railsbank\Exception;
 
-use Throwable;
-
 class RailsbankConfigurationMissingException extends \Exception
 {
     public function __construct($key = "")
     {
         $message = 'Railsbank configuration missing, refer to documentation.';
 
         if ($key !== '') {
-            $message .= '  Key and/or value missing=' . $key;
+            $message .= '  Key and/or value missing=' . $key . ' or all mode configuration are missing';
         }
 
         parent::__construct($message, 500);

diff --git a/src/Query/Me/PHPVersion.php b/src/Query/Me/PHPVersion.php
@@ -0,0 +1,19 @@
+<?php
+namespace Railsbank\Query\Me;
+
+use Railsbank\Command;
+use Railsbank\CommandInterface;
+use Railsbank\Query\QueryInterface;
+
+class PHPVersion extends Command implements CommandInterface, QueryInterface
+{
+    public function getInputFilterSpecification() : array
+    {
+        return [];
+    }
+
+    public function getBody() :? array
+    {
+        return [];
+    }
+}
diff --git a/src/Query/Version/GetVersion.php b/src/Query/Version/GetVersion.php
@@ -13,6 +13,6 @@ public function getInputFilterSpecification() : array
 
     public function getBody()
     {
-        //
+        return [];
     }
 }
diff --git a/src/QueryHandler/Me/PHPVersionHandler.php b/src/QueryHandler/Me/PHPVersionHandler.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Railsbank\QueryHandler\Me;
+
+use Railsbank\Handler;
+use Railsbank\Query\Me\PHPVersion;
+use Railsbank\RailsbankClient;
+use Railsbank\Query\Me\Information;
+
+/**
+ * Class PHPVersionHandler
+ * @package Railsbank\QueryHandler\Me
+ */
+class PHPVersionHandler extends Handler
+{
+    /**
+     * @param PHPVersion $command
+     * @return string|null
+     */
+    public function handlePHPVersion(PHPVersion $command)
+    {
+        return \phpversion('tidy');
+    }
+}
diff --git a/src/QueryHandler/Version/GetVersionHandler.php b/src/QueryHandler/Version/GetVersionHandler.php
@@ -19,13 +19,7 @@ class GetVersionHandler extends Handler
     public function handleGetVersion(GetVersion $command)
     {
         $client = new RailsbankClient($command->getRailsbankConfig());
-
-        try {
-            $version = $client->handleApiCall($command);
-        } catch (\Exception $e) {
-            // handle exceptions
-        }
-
+        $version = $client->handleApiCall($command);
         return $version;
     }
 }
diff --git a/src/Railsbank.php b/src/Railsbank.php
@@ -49,7 +49,7 @@ public function __construct(string $configFile = '', string $mode = 'play')
     private function getConfiguration(string $configFile)
     {
         if (empty($configFile)) {
-            return [];
+            throw new InvalidConfigException();
         }
 
         $config = require_once($configFile);

diff --git a/src/RailsbankConfig.php b/src/RailsbankConfig.php
@@ -35,18 +35,20 @@ class RailsbankConfig
      */
     public function __construct(array $config = [], string $mode = null)
     {
+        if ( !empty($mode)) {
+            $this->mode = $mode;
+        }
+
+        $mode = $this->getMode();
+
         $configServiceFactory = new ConfigServiceFactory($config);
         $this->configService = $configServiceFactory->getConfigService();
 
         /** @var Config $railsbankConfig */
         $railsbankConfig = $this->configService->get('railsbank_configuration');
 
-        if ( !empty($mode)) {
-            $this->mode = $mode;
-        }
-
         /** @var Config railsbankConfig */
-        $this->railsbankConfig = $railsbankConfig->get($this->getMode());
+        $this->railsbankConfig = $railsbankConfig->get($mode);
     }
 
     public function getBaseConfig() : Config

diff --git a/tests/CommandOrQueryTest.php b/tests/CommandOrQueryTest.php
@@ -6,6 +6,9 @@
 use Railsbank\CommandInterface;
 use PHPUnit\Framework\TestCase;
 use Railsbank\Command;
+use Railsbank\RailsbankConfig;
+use Zend\Config\Config;
+use Zend\InputFilter\InputFilterInterface;
 
 abstract class CommandOrQueryTest extends TestCase implements CommandOrQueryTestInterface
 {
@@ -25,11 +28,12 @@ public function testCommand($errorExpected = false, $input = [], $response = fal
 
         /** @var CommandInterface $command */
         $command = new $this->command($input);
-
         self::assertInstanceOf(Command::class, $command);
 
-        if ($response) {
+        if ($response || is_array($response)) {
             self::assertEquals($command->getBody(), $response);
         }
+
+        self::assertInstanceOf(InputFilterInterface::class, $command->getInput());
     }
 }