diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-06-03 12:03:02 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-06-03 12:33:29 +0200 |
| commit | d3e3a84cae9c8926bcff810a0e16bb9dcd024888 (patch) | |
| tree | 80d5588474a46f07c6dd8da142c429c3655f058f /tests/settings | |
| parent | 500748725c46803ff2a0ec291db37a831322012c (diff) | |
| download | nextcloud-server-d3e3a84cae9c8926bcff810a0e16bb9dcd024888.tar.gz nextcloud-server-d3e3a84cae9c8926bcff810a0e16bb9dcd024888.zip | |
Move the helpful method to the TestCase class
Diffstat (limited to 'tests/settings')
| -rw-r--r-- | tests/settings/controller/CheckSetupControllerTest.php | 14 | ||||
| -rw-r--r-- | tests/settings/controller/userscontrollertest.php | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/settings/controller/CheckSetupControllerTest.php b/tests/settings/controller/CheckSetupControllerTest.php index b21e78c831d..b39d13ac26b 100644 --- a/tests/settings/controller/CheckSetupControllerTest.php +++ b/tests/settings/controller/CheckSetupControllerTest.php @@ -81,7 +81,7 @@ class CheckSetupControllerTest extends TestCase { ->will($this->returnValue(false)); $this->assertFalse( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isInternetConnectionWorking' ) @@ -109,7 +109,7 @@ class CheckSetupControllerTest extends TestCase { $this->assertTrue( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isInternetConnectionWorking' ) @@ -134,7 +134,7 @@ class CheckSetupControllerTest extends TestCase { ->will($this->returnValue($client)); $this->assertFalse( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isInternetConnectionWorking' ) @@ -162,7 +162,7 @@ class CheckSetupControllerTest extends TestCase { ->will($this->returnValue($client)); $this->assertFalse( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isInternetConnectionWorking' ) @@ -176,7 +176,7 @@ class CheckSetupControllerTest extends TestCase { ->will($this->returnValue(null)); $this->assertFalse( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isMemcacheConfigured' ) @@ -190,7 +190,7 @@ class CheckSetupControllerTest extends TestCase { ->will($this->returnValue('SomeProvider')); $this->assertTrue( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isMemcacheConfigured' ) @@ -239,7 +239,7 @@ class CheckSetupControllerTest extends TestCase { 'dataDirectoryProtected' => true, 'isMemcacheConfigured' => true, 'memcacheDocs' => 'http://doc.owncloud.org/server/go.php?to=admin-performance', - 'isUrandomAvailable' => \Test_Helper::invokePrivate($this->checkSetupController, 'isUrandomAvailable'), + 'isUrandomAvailable' => self::invokePrivate($this->checkSetupController, 'isUrandomAvailable'), 'securityDocs' => 'https://doc.owncloud.org/server/8.1/admin_manual/configuration_server/hardening.html', ] ); diff --git a/tests/settings/controller/userscontrollertest.php b/tests/settings/controller/userscontrollertest.php index e70b235f603..5f98cf21c04 100644 --- a/tests/settings/controller/userscontrollertest.php +++ b/tests/settings/controller/userscontrollertest.php @@ -1290,7 +1290,7 @@ class UsersControllerTest extends \Test\TestCase { list($user, $expectedResult) = $this->mockUser(); - $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); + $result = self::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); $this->assertEquals($expectedResult, $result); } @@ -1327,7 +1327,7 @@ class UsersControllerTest extends \Test\TestCase { ) ->will($this->returnValue('1')); - $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); + $result = self::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); $this->assertEquals($expectedResult, $result); } @@ -1345,7 +1345,7 @@ class UsersControllerTest extends \Test\TestCase { $expectedResult['isRestoreDisabled'] = true; - $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); + $result = self::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); $this->assertEquals($expectedResult, $result); } @@ -1384,7 +1384,7 @@ class UsersControllerTest extends \Test\TestCase { $expectedResult['isRestoreDisabled'] = true; - $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); + $result = self::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); $this->assertEquals($expectedResult, $result); } |