diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2015-12-17 15:59:23 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2015-12-17 16:18:40 +0100 |
| commit | 1f715289bf1cafb7e51dce7a4ab478dd3db5088e (patch) | |
| tree | 81d3623bff851e08b205cfc3bbefc5c886ef530e /apps/files_sharing/tests | |
| parent | 9201b9713ed21566f90628d41c49056ca5314096 (diff) | |
| download | nextcloud-server-1f715289bf1cafb7e51dce7a4ab478dd3db5088e.tar.gz nextcloud-server-1f715289bf1cafb7e51dce7a4ab478dd3db5088e.zip | |
Removed deprecated function OC_User::deleteUser
Replaced with proper OCP calls
Diffstat (limited to 'apps/files_sharing/tests')
| -rw-r--r-- | apps/files_sharing/tests/controller/sharecontroller.php | 3 | ||||
| -rw-r--r-- | apps/files_sharing/tests/testcase.php | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php index d165151b87f..398538f0943 100644 --- a/apps/files_sharing/tests/controller/sharecontroller.php +++ b/apps/files_sharing/tests/controller/sharecontroller.php @@ -98,7 +98,8 @@ class ShareControllerTest extends \Test\TestCase { \OC_Util::tearDownFS(); \OC_User::setUserId(''); Filesystem::tearDown(); - \OC_User::deleteUser($this->user); + $user = \OC::$server->getUserManager()->get($this->user); + if ($user !== null) { $user->delete(); } \OC_User::setIncognitoMode(false); \OC::$server->getSession()->set('public_link_authenticated', ''); diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index cc82fc3d949..c4037c7c42e 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -117,9 +117,12 @@ abstract class TestCase extends \Test\TestCase { public static function tearDownAfterClass() { // cleanup users - \OC_User::deleteUser(self::TEST_FILES_SHARING_API_USER1); - \OC_User::deleteUser(self::TEST_FILES_SHARING_API_USER2); - \OC_User::deleteUser(self::TEST_FILES_SHARING_API_USER3); + $user = \OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER1); + if ($user !== null) { $user->delete(); } + $user = \OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER2); + if ($user !== null) { $user->delete(); } + $user = \OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER3); + if ($user !== null) { $user->delete(); } // delete group \OC_Group::deleteGroup(self::TEST_FILES_SHARING_API_GROUP1); |