Skip to content

Commit f4c980e

Browse files
author
Eugene Matvejev
authored
Merge pull request #75 from eugene-matvejev/improve-tests
RC10 - improve tests
2 parents 47e9b19 + 3963baa commit f4c980e

File tree

1 file changed

+43
-37
lines changed

1 file changed

+43
-37
lines changed

tests/phpunit/ScriptHandlerTest.php

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ class ScriptHandlerTest extends IntegrationTestSuite
1717
*
1818
* @expectedException \InvalidArgumentException
1919
*/
20-
function validateConfigurationExpectedExceptionOnNotExistingKey()
20+
public function validateConfigurationExpectedExceptionOnNotExistingKey()
2121
{
22-
$this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [[]]);
22+
$this->validateConfiguration([]);
2323
}
2424

2525
/**
@@ -28,9 +28,9 @@ function validateConfigurationExpectedExceptionOnNotExistingKey()
2828
*
2929
* @expectedException \InvalidArgumentException
3030
*/
31-
function validateConfigurationExpectedExceptionOnEmpty()
31+
public function validateConfigurationExpectedExceptionOnEmpty()
3232
{
33-
$this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [[ScriptHandler::CONFIG_MAIN_KEY]]);
33+
$this->validateConfiguration([ScriptHandler::CONFIG_MAIN_KEY => '']);
3434
}
3535

3636
/**
@@ -39,9 +39,9 @@ function validateConfigurationExpectedExceptionOnEmpty()
3939
*
4040
* @expectedException \InvalidArgumentException
4141
*/
42-
function validateConfigurationExpectedExceptionOnNotArray()
42+
public function validateConfigurationExpectedExceptionOnNotArray()
4343
{
44-
$this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [[ScriptHandler::CONFIG_MAIN_KEY => 'string']]);
44+
$this->validateConfiguration([ScriptHandler::CONFIG_MAIN_KEY => 'string']);
4545
}
4646

4747
/**
@@ -50,44 +50,40 @@ function validateConfigurationExpectedExceptionOnNotArray()
5050
*
5151
* @expectedException \InvalidArgumentException
5252
*/
53-
function validateConfigurationExpectedExceptionOptionIsNotArray()
53+
public function validateConfigurationExpectedExceptionOptionIsNotArray()
5454
{
55-
$arr = [
56-
ScriptHandler::CONFIG_MAIN_KEY => [
57-
'string'
58-
]
59-
];
60-
$this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [$arr]);
55+
$this->validateConfiguration([ScriptHandler::CONFIG_MAIN_KEY => ['string']]);
6156
}
6257

6358
/**
6459
* @see ScriptHandler::validateConfiguration
6560
* @test
6661
*/
67-
function validateConfigurationOnValid()
62+
public function validateConfigurationOnValid()
6863
{
69-
$arr = [
64+
$args = [
7065
ScriptHandler::CONFIG_MAIN_KEY => [
71-
[
72-
ScriptHandler::OPTION_KEY_INPUT => ['string'],
73-
ScriptHandler::OPTION_KEY_OUTPUT => 'string'
74-
]
66+
[ScriptHandler::OPTION_KEY_INPUT => ['string'], ScriptHandler::OPTION_KEY_OUTPUT => 'string']
7567
]
7668
];
77-
$result = $this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [$arr]);
78-
$this->assertTrue($result);
69+
70+
$this->assertTrue($this->validateConfiguration($args));
7971
}
8072

73+
private function validateConfiguration($args)
74+
{
75+
return $this->invokeMethod(new ScriptHandler(), 'validateConfiguration', [$args]);
76+
}
8177
/*** *************************** OPTIONS VALIDATION *************************** ***/
8278
/**
8379
* @see ScriptHandler::validateOptions
8480
* @test
8581
*
8682
* @expectedException \InvalidArgumentException
8783
*/
88-
function validateOptionsExpectedExceptionOnMissingInput()
84+
public function validateOptionsExpectedExceptionOnMissingInput()
8985
{
90-
$this->invokeMethod(new ScriptHandler(), 'validateOptions', [[ScriptHandler::OPTION_KEY_OUTPUT]]);
86+
$this->validateOptions([[ScriptHandler::OPTION_KEY_OUTPUT => 'output']]);
9187
}
9288

9389
/**
@@ -96,9 +92,9 @@ function validateOptionsExpectedExceptionOnMissingInput()
9692
*
9793
* @expectedException \InvalidArgumentException
9894
*/
99-
function validateOptionsExpectedExceptionOnMissingOutput()
95+
public function validateOptionsExpectedExceptionOnMissingOutput()
10096
{
101-
$this->invokeMethod(new ScriptHandler(), 'validateOptions', [[ScriptHandler::OPTION_KEY_INPUT]]);
97+
$this->validateOptions([ScriptHandler::OPTION_KEY_INPUT => 'input']);
10298
}
10399

104100
/**
@@ -107,12 +103,12 @@ function validateOptionsExpectedExceptionOnMissingOutput()
107103
*
108104
* @expectedException \InvalidArgumentException
109105
*/
110-
function validateOptionsExpectedExceptionOnInputNotArray()
106+
public function validateOptionsExpectedExceptionOnInputNotArray()
111107
{
112-
$this->invokeMethod(new ScriptHandler(), 'validateOptions', [[
108+
$this->validateOptions([
113109
ScriptHandler::OPTION_KEY_INPUT => 'string',
114110
ScriptHandler::OPTION_KEY_OUTPUT => 'string'
115-
]]);
111+
]);
116112
}
117113

118114
/**
@@ -121,25 +117,35 @@ function validateOptionsExpectedExceptionOnInputNotArray()
121117
*
122118
* @expectedException \InvalidArgumentException
123119
*/
124-
function validateOptionsExpectedExceptionOnOutputNotString()
120+
public function validateOptionsExpectedExceptionOnOutputNotString()
125121
{
126-
$this->invokeMethod(new ScriptHandler(), 'validateOptions', [[
122+
$this->validateOptions([
127123
ScriptHandler::OPTION_KEY_INPUT => ['string'],
128124
ScriptHandler::OPTION_KEY_OUTPUT => ['string']
129-
]]);
125+
]);
130126
}
131127

132128
/**
133129
* @see ScriptHandler::validateOptions
134130
* @test
135131
*/
136-
function validateOptionsOnValid()
132+
public function validateOptionsOnValid()
137133
{
138-
$options = [
139-
[ScriptHandler::OPTION_KEY_INPUT => ['string'], ScriptHandler::OPTION_KEY_OUTPUT => 'string']
140-
];
141-
$result = $this->invokeMethod(new ScriptHandler(), 'validateOptions', [$options]);
134+
$this->assertTrue(
135+
$this->validateOptions([
136+
ScriptHandler::OPTION_KEY_INPUT => ['string'],
137+
ScriptHandler::OPTION_KEY_OUTPUT => 'string'
138+
])
139+
);
140+
}
142141

143-
$this->assertTrue($result);
142+
/**
143+
* @param array $config
144+
*
145+
* @return bool
146+
*/
147+
private function validateOptions($config)
148+
{
149+
return $this->invokeMethod(new ScriptHandler(), 'validateOptions', [[$config]]);
144150
}
145151
}

0 commit comments

Comments
 (0)