Replaced with proper OCP callstags/v9.0beta1
@@ -49,9 +49,12 @@ class MigrationTest extends \Test\TestCase { | |||
} | |||
public static function tearDownAfterClass() { | |||
\OC_User::deleteUser(self::TEST_ENCRYPTION_MIGRATION_USER1); | |||
\OC_User::deleteUser(self::TEST_ENCRYPTION_MIGRATION_USER2); | |||
\OC_User::deleteUser(self::TEST_ENCRYPTION_MIGRATION_USER3); | |||
$user = \OC::$server->getUserManager()->get(self::TEST_ENCRYPTION_MIGRATION_USER1); | |||
if ($user !== null) { $user->delete(); } | |||
$user = \OC::$server->getUserManager()->get(self::TEST_ENCRYPTION_MIGRATION_USER2); | |||
if ($user !== null) { $user->delete(); } | |||
$user = \OC::$server->getUserManager()->get(self::TEST_ENCRYPTION_MIGRATION_USER3); | |||
if ($user !== null) { $user->delete(); } | |||
parent::tearDownAfterClass(); | |||
} | |||
@@ -82,7 +82,8 @@ class TagServiceTest extends \Test\TestCase { | |||
protected function tearDown() { | |||
\OC_User::setUserId(''); | |||
\OC_User::deleteUser($this->user); | |||
$user = \OC::$server->getUserManager()->get($this->user); | |||
if ($user !== null) { $user->delete(); } | |||
} | |||
public function testUpdateFileTags() { |
@@ -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', ''); |
@@ -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); |
@@ -75,7 +75,8 @@ class Storage extends \Test\TestCase { | |||
protected function tearDown() { | |||
\OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin'); | |||
$this->logout(); | |||
\OC_User::deleteUser($this->user); | |||
$user = \OC::$server->getUserManager()->get($this->user); | |||
if ($user !== null) { $user->delete(); } | |||
\OC_Hook::clear(); | |||
parent::tearDown(); | |||
} |
@@ -88,7 +88,8 @@ class Test_Trashbin extends \Test\TestCase { | |||
public static function tearDownAfterClass() { | |||
// cleanup test user | |||
\OC_User::deleteUser(self::TEST_TRASHBIN_USER1); | |||
$user = \OC::$server->getUserManager()->get(self::TEST_TRASHBIN_USER1); | |||
if ($user !== null) { $user->delete(); } | |||
\OC::$server->getConfig()->setSystemValue('trashbin_retention_obligation', self::$rememberRetentionObligation); | |||
@@ -61,8 +61,10 @@ class Test_Files_Versioning extends \Test\TestCase { | |||
public static function tearDownAfterClass() { | |||
// cleanup test user | |||
\OC_User::deleteUser(self::TEST_VERSIONS_USER); | |||
\OC_User::deleteUser(self::TEST_VERSIONS_USER2); | |||
$user = \OC::$server->getUserManager()->get(self::TEST_VERSIONS_USER); | |||
if ($user !== null) { $user->delete(); } | |||
$user = \OC::$server->getUserManager()->get(self::TEST_VERSIONS_USER2); | |||
if ($user !== null) { $user->delete(); } | |||
parent::tearDownAfterClass(); | |||
} |
@@ -152,24 +152,6 @@ class OC_User { | |||
} | |||
} | |||
/** | |||
* delete a user | |||
* | |||
* @param string $uid The username of the user to delete | |||
* @return bool | |||
* | |||
* Deletes a user | |||
* @deprecated Use \OC::$server->getUserManager()->get() and then run delete() on the return | |||
*/ | |||
public static function deleteUser($uid) { | |||
$user = \OC::$server->getUserManager()->get($uid); | |||
if ($user) { | |||
return $user->delete(); | |||
} else { | |||
return false; | |||
} | |||
} | |||
/** | |||
* Try to login a user | |||
* |
@@ -373,7 +373,8 @@ class Cache extends \Test\TestCase { | |||
$tagManager->delete('tag2'); | |||
$this->logout(); | |||
\OC_User::deleteUser($userId); | |||
$user = \OC::$server->getUserManager()->get($userId); | |||
if ($user !== null) { $user->delete(); } | |||
} | |||
function testMove() { |
@@ -72,7 +72,10 @@ class UpdaterLegacy extends \Test\TestCase { | |||
if ($this->cache) { | |||
$this->cache->clear(); | |||
} | |||
$result = \OC_User::deleteUser(self::$user); | |||
$result = false; | |||
$user = \OC::$server->getUserManager()->get(self::$user); | |||
if ($user !== null) { $result = $user->delete(); } | |||
$this->assertTrue($result); | |||
$this->logout(); |
@@ -340,7 +340,8 @@ class Filesystem extends \Test\TestCase { | |||
$this->assertEquals('home::' . $userId, $homeMount->getId()); | |||
} | |||
\OC_User::deleteUser($userId); | |||
$user = \OC::$server->getUserManager()->get($userId); | |||
if ($user !== null) { $user->delete(); } | |||
} | |||
/** | |||
@@ -368,7 +369,8 @@ class Filesystem extends \Test\TestCase { | |||
$this->assertTrue($homeMount->instanceOfStorage('\OC\Files\Storage\Home')); | |||
$this->assertEquals('local::' . $datadir . '/' . $userId . '/', $homeMount->getId()); | |||
\OC_User::deleteUser($userId); | |||
$user = \OC::$server->getUserManager()->get($userId); | |||
if ($user !== null) { $user->delete(); } | |||
// delete storage entry | |||
$cache->clear(); | |||
} | |||
@@ -398,7 +400,8 @@ class Filesystem extends \Test\TestCase { | |||
list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath('/' . $userId . '/cache'); | |||
$this->assertTrue($storage->instanceOfStorage('\OCP\Files\IHomeStorage')); | |||
$this->assertEquals('cache', $internalPath); | |||
\OC_User::deleteUser($userId); | |||
$user = \OC::$server->getUserManager()->get($userId); | |||
if ($user !== null) { $user->delete(); } | |||
$config->setSystemValue('cache_path', $oldCachePath); | |||
} | |||
@@ -426,7 +429,8 @@ class Filesystem extends \Test\TestCase { | |||
list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath('/' . $userId . '/cache'); | |||
$this->assertTrue($storage->instanceOfStorage('\OC\Files\Storage\Local')); | |||
$this->assertEquals('', $internalPath); | |||
\OC_User::deleteUser($userId); | |||
$user = \OC::$server->getUserManager()->get($userId); | |||
if ($user !== null) { $user->delete(); } | |||
$config->setSystemValue('cache_path', $oldCachePath); | |||
} |
@@ -51,7 +51,8 @@ class Swift extends \Test\Files\Storage\Storage { | |||
// create users | |||
$users = array('test'); | |||
foreach($users as $userName) { | |||
\OC_User::deleteUser($userName); | |||
$user = \OC::$server->getUserManager()->get($userName); | |||
if ($user !== null) { $user->delete(); } | |||
\OC::$server->getUserManager()->createUser($userName, $userName); | |||
} | |||
@@ -76,7 +77,8 @@ class Swift extends \Test\Files\Storage\Storage { | |||
$users = array('test'); | |||
foreach($users as $userName) { | |||
\OC_User::deleteUser($userName); | |||
$user = \OC::$server->getUserManager()->get($userName); | |||
if ($user !== null) { $user->delete(); } | |||
} | |||
parent::tearDown(); | |||
} |
@@ -44,7 +44,8 @@ class HomeStorageQuota extends \Test\TestCase { | |||
// clean up | |||
\OC_User::setUserId(''); | |||
\OC_User::deleteUser($user1); | |||
$user = \OC::$server->getUserManager()->get($user1); | |||
if ($user !== null) { $user->delete(); } | |||
\OC::$server->getConfig()->deleteAllUserValues($user1); | |||
\OC_Util::tearDownFS(); | |||
} | |||
@@ -71,7 +72,8 @@ class HomeStorageQuota extends \Test\TestCase { | |||
// clean up | |||
\OC_User::setUserId(''); | |||
\OC_User::deleteUser($user1); | |||
$user = \OC::$server->getUserManager()->get($user1); | |||
if ($user !== null) { $user->delete(); } | |||
\OC::$server->getConfig()->deleteAllUserValues($user1); | |||
\OC_Util::tearDownFS(); | |||
} |
@@ -45,7 +45,8 @@ class Test_Helper_Storage extends \Test\TestCase { | |||
\OC\Files\Filesystem::mount($this->storage, array(), '/'); | |||
\OC_User::setUserId(''); | |||
\OC_User::deleteUser($this->user); | |||
$user = \OC::$server->getUserManager()->get($this->user); | |||
if ($user !== null) { $user->delete(); } | |||
\OC::$server->getConfig()->deleteAllUserValues($this->user); | |||
parent::tearDown(); |
@@ -39,7 +39,8 @@ class CertificateManagerTest extends \Test\TestCase { | |||
} | |||
protected function tearDown() { | |||
\OC_User::deleteUser($this->username); | |||
$user = \OC::$server->getUserManager()->get($this->username); | |||
if ($user !== null) { $user->delete(); } | |||
parent::tearDown(); | |||
} | |||
@@ -94,13 +94,20 @@ class Test_Share extends \Test\TestCase { | |||
$query->execute(array('test')); | |||
\OC::$server->getAppConfig()->setValue('core', 'shareapi_allow_resharing', $this->resharing); | |||
OC_User::deleteUser($this->user1); | |||
OC_User::deleteUser($this->user2); | |||
OC_User::deleteUser($this->user3); | |||
OC_User::deleteUser($this->user4); | |||
OC_User::deleteUser($this->user5); | |||
OC_User::deleteUser($this->user6); | |||
OC_User::deleteUser($this->groupAndUser); | |||
$user = \OC::$server->getUserManager()->get($this->user1); | |||
if ($user !== null) { $user->delete(); } | |||
$user = \OC::$server->getUserManager()->get($this->user2); | |||
if ($user !== null) { $user->delete(); } | |||
$user = \OC::$server->getUserManager()->get($this->user3); | |||
if ($user !== null) { $user->delete(); } | |||
$user = \OC::$server->getUserManager()->get($this->user4); | |||
if ($user !== null) { $user->delete(); } | |||
$user = \OC::$server->getUserManager()->get($this->user5); | |||
if ($user !== null) { $user->delete(); } | |||
$user = \OC::$server->getUserManager()->get($this->user6); | |||
if ($user !== null) { $user->delete(); } | |||
$user = \OC::$server->getUserManager()->get($this->groupAndUser); | |||
if ($user !== null) { $user->delete(); } | |||
OC_Group::deleteGroup($this->group1); | |||
OC_Group::deleteGroup($this->group2); | |||
@@ -375,7 +382,8 @@ class Test_Share extends \Test\TestCase { | |||
// Remove user | |||
OC_User::setUserId($this->user1); | |||
OC_User::deleteUser($this->user1); | |||
$user = \OC::$server->getUserManager()->get($this->user1); | |||
if ($user !== null) { $user->delete(); } | |||
OC_User::setUserId($this->user2); | |||
$this->assertEquals(array('test1.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET)); | |||
} |
@@ -51,15 +51,5 @@ class User extends TestCase { | |||
$uid = \OC_User::checkPassword('foo', 'bar'); | |||
$this->assertEquals($uid, 'foo'); | |||
} | |||
public function testDeleteUser() { | |||
$fail = \OC_User::deleteUser('victim'); | |||
$this->assertFalse($fail); | |||
$success = \OC::$server->getUserManager()->createUser('victim', 'password'); | |||
$success = \OC_User::deleteUser('victim'); | |||
$this->assertTrue($success); | |||
} | |||
} |