Merge pull request #75 from eugene-matvejev/improve-tests

RC10 - improve tests

Author: Eugene Matvejev

tests/phpunit/ScriptHandlerTest.php

@@ -17,9 +17,9 @@ class ScriptHandlerTest extends IntegrationTestSuite
      *
      * @expectedException \InvalidArgumentException
      */
-    function validateConfigurationExpectedExceptionOnNotExistingKey()
+    public function validateConfigurationExpectedExceptionOnNotExistingKey()
     {
-        $this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [[]]);
+        $this->validateConfiguration([]);
     }
 
     /**
@@ -28,9 +28,9 @@ function validateConfigurationExpectedExceptionOnNotExistingKey()
      *
      * @expectedException \InvalidArgumentException
      */
-    function validateConfigurationExpectedExceptionOnEmpty()
+    public function validateConfigurationExpectedExceptionOnEmpty()
     {
-        $this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [[ScriptHandler::CONFIG_MAIN_KEY]]);
+        $this->validateConfiguration([ScriptHandler::CONFIG_MAIN_KEY => '']);
     }
 
     /**
@@ -39,9 +39,9 @@ function validateConfigurationExpectedExceptionOnEmpty()
      *
      * @expectedException \InvalidArgumentException
      */
-    function validateConfigurationExpectedExceptionOnNotArray()
+    public function validateConfigurationExpectedExceptionOnNotArray()
     {
-        $this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [[ScriptHandler::CONFIG_MAIN_KEY => 'string']]);
+        $this->validateConfiguration([ScriptHandler::CONFIG_MAIN_KEY => 'string']);
     }
 
     /**
@@ -50,44 +50,40 @@ function validateConfigurationExpectedExceptionOnNotArray()
      *
      * @expectedException \InvalidArgumentException
      */
-    function validateConfigurationExpectedExceptionOptionIsNotArray()
+    public function validateConfigurationExpectedExceptionOptionIsNotArray()
     {
-        $arr = [
-            ScriptHandler::CONFIG_MAIN_KEY => [
-                'string'
-            ]
-        ];
-        $this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [$arr]);
+        $this->validateConfiguration([ScriptHandler::CONFIG_MAIN_KEY => ['string']]);
     }
 
     /**
      * @see ScriptHandler::validateConfiguration
      * @test
      */
-    function validateConfigurationOnValid()
+    public function validateConfigurationOnValid()
     {
-        $arr = [
+        $args = [
             ScriptHandler::CONFIG_MAIN_KEY => [
-                [
-                    ScriptHandler::OPTION_KEY_INPUT  => ['string'],
-                    ScriptHandler::OPTION_KEY_OUTPUT => 'string'
-                ]
+                [ScriptHandler::OPTION_KEY_INPUT => ['string'], ScriptHandler::OPTION_KEY_OUTPUT => 'string']
             ]
         ];
-        $result = $this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [$arr]);
-        $this->assertTrue($result);
+
+        $this->assertTrue($this->validateConfiguration($args));
     }
 
+    private function validateConfiguration($args)
+    {
+        return $this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [$args]);
+    }
     /*** *************************** OPTIONS VALIDATION *************************** ***/
     /**
      * @see ScriptHandler::validateOptions
      * @test
      *
      * @expectedException \InvalidArgumentException
      */
-    function validateOptionsExpectedExceptionOnMissingInput()
+    public function validateOptionsExpectedExceptionOnMissingInput()
     {
-        $this->invokeMethod(new ScriptHandler(), 'validateOptions', [[ScriptHandler::OPTION_KEY_OUTPUT]]);
+        $this->validateOptions([[ScriptHandler::OPTION_KEY_OUTPUT => 'output']]);
     }
 
     /**
@@ -96,9 +92,9 @@ function validateOptionsExpectedExceptionOnMissingInput()
      *
      * @expectedException \InvalidArgumentException
      */
-    function validateOptionsExpectedExceptionOnMissingOutput()
+    public function validateOptionsExpectedExceptionOnMissingOutput()
     {
-        $this->invokeMethod(new ScriptHandler(), 'validateOptions', [[ScriptHandler::OPTION_KEY_INPUT]]);
+        $this->validateOptions([ScriptHandler::OPTION_KEY_INPUT => 'input']);
     }
 
     /**
@@ -107,12 +103,12 @@ function validateOptionsExpectedExceptionOnMissingOutput()
      *
      * @expectedException \InvalidArgumentException
      */
-    function validateOptionsExpectedExceptionOnInputNotArray()
+    public function validateOptionsExpectedExceptionOnInputNotArray()
     {
-        $this->invokeMethod(new ScriptHandler(), 'validateOptions', [[
+        $this->validateOptions([
             ScriptHandler::OPTION_KEY_INPUT  => 'string',
             ScriptHandler::OPTION_KEY_OUTPUT => 'string'
-        ]]);
+        ]);
     }
 
     /**
@@ -121,25 +117,35 @@ function validateOptionsExpectedExceptionOnInputNotArray()
      *
      * @expectedException \InvalidArgumentException
      */
-    function validateOptionsExpectedExceptionOnOutputNotString()
+    public function validateOptionsExpectedExceptionOnOutputNotString()
     {
-        $this->invokeMethod(new ScriptHandler(), 'validateOptions', [[
+        $this->validateOptions([
             ScriptHandler::OPTION_KEY_INPUT  => ['string'],
             ScriptHandler::OPTION_KEY_OUTPUT => ['string']
-        ]]);
+        ]);
     }
 
     /**
      * @see ScriptHandler::validateOptions
      * @test
      */
-    function validateOptionsOnValid()
+    public function validateOptionsOnValid()
     {
-        $options = [
-            [ScriptHandler::OPTION_KEY_INPUT => ['string'], ScriptHandler::OPTION_KEY_OUTPUT => 'string']
-        ];
-        $result = $this->invokeMethod(new ScriptHandler(), 'validateOptions', [$options]);
+        $this->assertTrue(
+            $this->validateOptions([
+                ScriptHandler::OPTION_KEY_INPUT  => ['string'],
+                ScriptHandler::OPTION_KEY_OUTPUT => 'string'
+            ])
+        );
+    }
 
-        $this->assertTrue($result);
+    /**
+     * @param array $config
+     *
+     * @return bool
+     */
+    private function validateOptions($config)
+    {
+        return $this->invokeMethod(new ScriptHandler(), 'validateOptions', [[$config]]);
     }
 }