diff options
| -rw-r--r-- | tests/core/command/config/app/deleteconfigtest.php | 2 | ||||
| -rw-r--r-- | tests/core/command/config/app/getconfigtest.php | 2 | ||||
| -rw-r--r-- | tests/core/command/config/app/setconfigtest.php | 2 | ||||
| -rw-r--r-- | tests/core/command/config/importtest.php | 12 | ||||
| -rw-r--r-- | tests/core/command/config/listconfigstest.php | 2 | ||||
| -rw-r--r-- | tests/core/command/config/system/deleteconfigtest.php | 2 | ||||
| -rw-r--r-- | tests/core/command/config/system/getconfigtest.php | 2 | ||||
| -rw-r--r-- | tests/core/command/config/system/setconfigtest.php | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/tests/core/command/config/app/deleteconfigtest.php b/tests/core/command/config/app/deleteconfigtest.php index 3f369e8f405..7056e1b1ff9 100644 --- a/tests/core/command/config/app/deleteconfigtest.php +++ b/tests/core/command/config/app/deleteconfigtest.php @@ -118,6 +118,6 @@ class DeleteConfigTest extends TestCase { ->method('writeln') ->with($this->stringContains($expectedMessage)); - $this->assertSame($expectedReturn, \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput])); + $this->assertSame($expectedReturn, $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput])); } } diff --git a/tests/core/command/config/app/getconfigtest.php b/tests/core/command/config/app/getconfigtest.php index 81d0eb74473..1ceeb16ccf4 100644 --- a/tests/core/command/config/app/getconfigtest.php +++ b/tests/core/command/config/app/getconfigtest.php @@ -152,7 +152,7 @@ class GetConfigTest extends TestCase { }); } - $this->assertSame($expectedReturn, \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput])); + $this->assertSame($expectedReturn, $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput])); if ($expectedMessage !== null) { global $output; diff --git a/tests/core/command/config/app/setconfigtest.php b/tests/core/command/config/app/setconfigtest.php index 0c4aa6850c8..14d7b0cb7b5 100644 --- a/tests/core/command/config/app/setconfigtest.php +++ b/tests/core/command/config/app/setconfigtest.php @@ -113,6 +113,6 @@ class SetConfigTest extends TestCase { ->method('writeln') ->with($this->stringContains($expectedMessage)); - \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); + $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); } } diff --git a/tests/core/command/config/importtest.php b/tests/core/command/config/importtest.php index d465c8ca479..f14880f8bf4 100644 --- a/tests/core/command/config/importtest.php +++ b/tests/core/command/config/importtest.php @@ -66,7 +66,7 @@ class ImportTest extends TestCase { * @param mixed $configValue */ public function testValidateAppsArray($configValue) { - \Test_Helper::invokePrivate($this->command, 'validateAppsArray', [['app' => ['name' => $configValue]]]); + $this->invokePrivate($this->command, 'validateAppsArray', [['app' => ['name' => $configValue]]]); $this->assertTrue(true, 'Asserting that no exception is thrown'); } @@ -86,7 +86,7 @@ class ImportTest extends TestCase { */ public function testValidateAppsArrayThrows($configValue) { try { - \Test_Helper::invokePrivate($this->command, 'validateAppsArray', [['app' => ['name' => $configValue]]]); + $this->invokePrivate($this->command, 'validateAppsArray', [['app' => ['name' => $configValue]]]); $this->fail('Did not throw expected UnexpectedValueException'); } catch (\UnexpectedValueException $e) { $this->assertStringStartsWith('Invalid app config value for "app":"name".', $e->getMessage()); @@ -115,7 +115,7 @@ class ImportTest extends TestCase { * @param mixed $configValue */ public function testCheckTypeRecursively($configValue) { - \Test_Helper::invokePrivate($this->command, 'checkTypeRecursively', [$configValue, 'name']); + $this->invokePrivate($this->command, 'checkTypeRecursively', [$configValue, 'name']); $this->assertTrue(true, 'Asserting that no exception is thrown'); } @@ -135,7 +135,7 @@ class ImportTest extends TestCase { */ public function testCheckTypeRecursivelyThrows($configValue) { try { - \Test_Helper::invokePrivate($this->command, 'checkTypeRecursively', [$configValue, 'name']); + $this->invokePrivate($this->command, 'checkTypeRecursively', [$configValue, 'name']); $this->fail('Did not throw expected UnexpectedValueException'); } catch (\UnexpectedValueException $e) { $this->assertStringStartsWith('Invalid system config value for "name"', $e->getMessage()); @@ -156,7 +156,7 @@ class ImportTest extends TestCase { * @param array $configArray */ public function testValidateArray($configArray) { - \Test_Helper::invokePrivate($this->command, 'validateArray', [$configArray]); + $this->invokePrivate($this->command, 'validateArray', [$configArray]); $this->assertTrue(true, 'Asserting that no exception is thrown'); } @@ -176,7 +176,7 @@ class ImportTest extends TestCase { */ public function testValidateArrayThrows($configArray, $expectedException) { try { - \Test_Helper::invokePrivate($this->command, 'validateArray', [$configArray]); + $this->invokePrivate($this->command, 'validateArray', [$configArray]); $this->fail('Did not throw expected UnexpectedValueException'); } catch (\UnexpectedValueException $e) { $this->assertStringStartsWith($expectedException, $e->getMessage()); diff --git a/tests/core/command/config/listconfigstest.php b/tests/core/command/config/listconfigstest.php index f6d78232167..b7021384df9 100644 --- a/tests/core/command/config/listconfigstest.php +++ b/tests/core/command/config/listconfigstest.php @@ -281,7 +281,7 @@ class ListConfigsTest extends TestCase { return $output; }); - \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); + $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); $this->assertEquals($expected, trim($output, "\n")); } diff --git a/tests/core/command/config/system/deleteconfigtest.php b/tests/core/command/config/system/deleteconfigtest.php index b10fa16ed61..aa1f93274c7 100644 --- a/tests/core/command/config/system/deleteconfigtest.php +++ b/tests/core/command/config/system/deleteconfigtest.php @@ -115,6 +115,6 @@ class DeleteConfigTest extends TestCase { ->method('writeln') ->with($this->stringContains($expectedMessage)); - $this->assertSame($expectedReturn, \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput])); + $this->assertSame($expectedReturn, $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput])); } } diff --git a/tests/core/command/config/system/getconfigtest.php b/tests/core/command/config/system/getconfigtest.php index 1c74bcd67ce..54dcdd434ab 100644 --- a/tests/core/command/config/system/getconfigtest.php +++ b/tests/core/command/config/system/getconfigtest.php @@ -149,7 +149,7 @@ class GetConfigTest extends TestCase { }); } - $this->assertSame($expectedReturn, \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput])); + $this->assertSame($expectedReturn, $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput])); if ($expectedMessage !== null) { global $output; diff --git a/tests/core/command/config/system/setconfigtest.php b/tests/core/command/config/system/setconfigtest.php index 53bb9e59e11..bbabee9b18f 100644 --- a/tests/core/command/config/system/setconfigtest.php +++ b/tests/core/command/config/system/setconfigtest.php @@ -110,6 +110,6 @@ class SetConfigTest extends TestCase { ->method('writeln') ->with($this->stringContains($expectedMessage)); - \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); + $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); } } |