Skip to content

RC10 - improve tests #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 2, 2016
Merged

RC10 - improve tests #75

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9760c9
Merge pull request #24 from learn-symfony/master
Jul 1, 2016
d1d4444
improve tests
eugene-matvejev Jul 2, 2016
3963baa
Merge branch 'master' into improve-tests
eugene-matvejev Jul 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 43 additions & 37 deletions tests/phpunit/ScriptHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ class ScriptHandlerTest extends IntegrationTestSuite
*
* @expectedException \InvalidArgumentException
*/
function validateConfigurationExpectedExceptionOnNotExistingKey()
public function validateConfigurationExpectedExceptionOnNotExistingKey()
{
$this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [[]]);
$this->validateConfiguration([]);
}

/**
Expand All @@ -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 => '']);
}

/**
Expand All @@ -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']);
}

/**
Expand All @@ -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']]);
}

/**
Expand All @@ -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']);
}

/**
Expand All @@ -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'
]]);
]);
}

/**
Expand All @@ -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]]);
}
}