From dfd9d5f504f69bf3b42356f1e29b9d964a928a59 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 2 Jun 2021 15:19:53 +0200 Subject: [PATCH] Use self::getUniqueID instead of uniqid Signed-off-by: Lukas Reschke --- .../tests/unit/Connector/Sabre/FileTest.php | 2 +- .../tests/FederatedShareProviderTest.php | 6 ++--- apps/files_sharing/tests/TestCase.php | 8 +++--- .../tests/ShareByMailProviderTest.php | 8 +++--- tests/lib/AppTest.php | 6 ++--- tests/lib/Cache/FileCacheTest.php | 2 +- tests/lib/Files/ViewTest.php | 2 +- .../lib/Share20/DefaultShareProviderTest.php | 26 +++++++++---------- tests/lib/SubAdminTest.php | 2 +- tests/lib/User/UserTest.php | 2 +- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php index b577dc001f..bdee67469c 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FileTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php @@ -79,7 +79,7 @@ class FileTest extends TestCase { \OC_Hook::clear(); - $this->user = 'test_user' . uniqid('', true); + $this->user = self::getUniqueID('test_user'); $this->createUser($this->user, 'pass'); $this->loginAsUser($this->user); diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php index 89408862d5..cc8ca0e259 100644 --- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php +++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php @@ -892,8 +892,8 @@ class FederatedShareProviderTest extends \Test\TestCase { $userManager = \OC::$server->getUserManager(); $rootFolder = \OC::$server->getRootFolder(); - $u1 = $userManager->createUser(uniqid('testFed', true), md5(time())); - $u2 = $userManager->createUser(uniqid('testFed2', true), md5(time())); + $u1 = $userManager->createUser(self::getUniqueID('testFed'), md5(time())); + $u2 = $userManager->createUser(self::getUniqueID('testFed2'), md5(time())); $folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo'); $file1 = $folder1->newFile('bar1'); @@ -946,7 +946,7 @@ class FederatedShareProviderTest extends \Test\TestCase { $userManager = \OC::$server->getUserManager(); $rootFolder = \OC::$server->getRootFolder(); - $u1 = $userManager->createUser(uniqid('testFed', true), md5(time())); + $u1 = $userManager->createUser(self::getUniqueID('testFed'), md5(time())); $folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo'); $file1 = $folder1->newFile('bar1'); diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php index 284aafb0f6..36d8bcd972 100644 --- a/apps/files_sharing/tests/TestCase.php +++ b/apps/files_sharing/tests/TestCase.php @@ -83,10 +83,10 @@ abstract class TestCase extends \Test\TestCase { \OC::registerShareHooks(\OC::$server->getSystemConfig()); // User Prefix - $this->TEST_FILES_SHARING_API_USER1 = $this->TEST_FILES_SHARING_API_USER1 . uniqid("", true); - $this->TEST_FILES_SHARING_API_USER2 = $this->TEST_FILES_SHARING_API_USER2 . uniqid("", true); - $this->TEST_FILES_SHARING_API_USER3 = $this->TEST_FILES_SHARING_API_USER3 . uniqid("", true); - $this->TEST_FILES_SHARING_API_USER4 = $this->TEST_FILES_SHARING_API_USER4 . uniqid("", true); + $this->TEST_FILES_SHARING_API_USER1 = self::getUniqueID($this->TEST_FILES_SHARING_API_USER1); + $this->TEST_FILES_SHARING_API_USER2 = self::getUniqueID($this->TEST_FILES_SHARING_API_USER2); + $this->TEST_FILES_SHARING_API_USER3 = self::getUniqueID($this->TEST_FILES_SHARING_API_USER3); + $this->TEST_FILES_SHARING_API_USER4 = self::getUniqueID($this->TEST_FILES_SHARING_API_USER4); // create users $backend = new \Test\Util\User\Dummy(); diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php index cd0f3ff8ec..7628e0e02e 100644 --- a/apps/sharebymail/tests/ShareByMailProviderTest.php +++ b/apps/sharebymail/tests/ShareByMailProviderTest.php @@ -987,8 +987,8 @@ class ShareByMailProviderTest extends TestCase { $provider = $this->getInstance(['sendMailNotification', 'createShareActivity']); - $u1 = $userManager->createUser(uniqid('testFed', true), md5(time())); - $u2 = $userManager->createUser(uniqid('testFed2', true), md5(time())); + $u1 = $userManager->createUser(self::getUniqueID('testFed'), md5(time())); + $u2 = $userManager->createUser(self::getUniqueID('testFed2'), md5(time())); $folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo'); $file1 = $folder1->newFile('bar1'); @@ -1033,8 +1033,8 @@ class ShareByMailProviderTest extends TestCase { $provider = $this->getInstance(['sendMailNotification', 'createShareActivity']); - $u1 = $userManager->createUser(uniqid('testFed', true), md5(time())); - $u2 = $userManager->createUser(uniqid('testFed2', true), md5(time())); + $u1 = $userManager->createUser(self::getUniqueID('testFed'), md5(time())); + $u2 = $userManager->createUser(self::getUniqueID('testFed2'), md5(time())); $folder = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo'); diff --git a/tests/lib/AppTest.php b/tests/lib/AppTest.php index dd84d273fa..f200f2ee1a 100644 --- a/tests/lib/AppTest.php +++ b/tests/lib/AppTest.php @@ -306,9 +306,9 @@ class AppTest extends \Test\TestCase { public function setUp(): void { parent::setUp(); - $this->TEST_USER1 = $this->TEST_USER1 . uniqid('', true); - $this->TEST_USER2 = $this->TEST_USER2 . uniqid('', true); - $this->TEST_USER3 = $this->TEST_USER3 . uniqid('', true); + $this->TEST_USER1 = self::getUniqueID($this->TEST_USER1); + $this->TEST_USER2 = self::getUniqueID($this->TEST_USER2); + $this->TEST_USER3 = self::getUniqueID($this->TEST_USER3); } /** diff --git a/tests/lib/Cache/FileCacheTest.php b/tests/lib/Cache/FileCacheTest.php index 109f57f67b..1f9c9f55b7 100644 --- a/tests/lib/Cache/FileCacheTest.php +++ b/tests/lib/Cache/FileCacheTest.php @@ -71,7 +71,7 @@ class FileCacheTest extends TestCache { \OC_User::useBackend(new \Test\Util\User\Dummy()); //login - $this->userId = 'test' . uniqid('', true); + $this->userId = self::getUniqueID('test'); \OC::$server->getUserManager()->createUser($this->userId, 'test'); $this->user = \OC_User::getUser(); diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index fc51528242..03c5f5e369 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -96,7 +96,7 @@ class ViewTest extends \Test\TestCase { //login $userManager = \OC::$server->getUserManager(); $groupManager = \OC::$server->getGroupManager(); - $this->user = 'test' . uniqid('', true); + $this->user = self::getUniqueID('test'); $this->userObject = $userManager->createUser($this->user, 'test'); $this->groupObject = $groupManager->createGroup('group1'); diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index 0b077df482..96ee94b3be 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -2492,9 +2492,9 @@ class DefaultShareProviderTest extends \Test\TestCase { $password = md5(time()); - $u1 = $userManager->createUser(uniqid('testShare1', true), $password); - $u2 = $userManager->createUser(uniqid('testShare2', true), $password); - $u3 = $userManager->createUser(uniqid('testShare3', true), $password); + $u1 = $userManager->createUser(self::getUniqueID('testShare1'), $password); + $u2 = $userManager->createUser(self::getUniqueID('testShare2'), $password); + $u3 = $userManager->createUser(self::getUniqueID('testShare3'), $password); $g1 = $groupManager->createGroup('group1'); @@ -2588,11 +2588,11 @@ class DefaultShareProviderTest extends \Test\TestCase { $this->config ); - $u1 = $userManager->createUser(uniqid('testShare1', true), 'test'); - $u2 = $userManager->createUser(uniqid('testShare2', true), 'test'); - $u3 = $userManager->createUser(uniqid('testShare3', true),'test'); - $u4 = $userManager->createUser(uniqid('testShare4', true), 'test'); - $u5 = $userManager->createUser(uniqid('testShare5', true), 'test'); + $u1 = $userManager->createUser(self::getUniqueID('testShare1'), 'test'); + $u2 = $userManager->createUser(self::getUniqueID('testShare2'), 'test'); + $u3 = $userManager->createUser(self::getUniqueID('testShare3'),'test'); + $u4 = $userManager->createUser(self::getUniqueID('testShare4'), 'test'); + $u5 = $userManager->createUser(self::getUniqueID('testShare5'), 'test'); $g1 = $groupManager->createGroup('group1'); $g1->addUser($u3); @@ -2684,11 +2684,11 @@ class DefaultShareProviderTest extends \Test\TestCase { $this->config ); - $u1 = $userManager->createUser(uniqid('testShare1', true), 'test'); - $u2 = $userManager->createUser(uniqid('testShare2', true), 'test'); - $u3 = $userManager->createUser(uniqid('testShare3', true), 'test'); - $u4 = $userManager->createUser(uniqid('testShare4', true), 'test'); - $u5 = $userManager->createUser(uniqid('testShare5', true),'test'); + $u1 = $userManager->createUser(self::getUniqueID('testShare1'), 'test'); + $u2 = $userManager->createUser(self::getUniqueID('testShare2'), 'test'); + $u3 = $userManager->createUser(self::getUniqueID('testShare3'), 'test'); + $u4 = $userManager->createUser(self::getUniqueID('testShare4'), 'test'); + $u5 = $userManager->createUser(self::getUniqueID('testShare5'),'test'); $g1 = $groupManager->createGroup('group1'); $g1->addUser($u3); diff --git a/tests/lib/SubAdminTest.php b/tests/lib/SubAdminTest.php index 924fa89904..3281c01195 100644 --- a/tests/lib/SubAdminTest.php +++ b/tests/lib/SubAdminTest.php @@ -59,7 +59,7 @@ class SubAdminTest extends \Test\TestCase { // Create 3 users and 3 groups for ($i = 0; $i < 3; $i++) { - $this->users[] = $this->userManager->createUser('user'.$i.uniqid('', true), 'user'); + $this->users[] = $this->userManager->createUser(self::getUniqueID('user'.$i), 'user'); $this->groups[] = $this->groupManager->createGroup('group'.$i); } diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php index f33466478d..d7ad2488b3 100644 --- a/tests/lib/User/UserTest.php +++ b/tests/lib/User/UserTest.php @@ -504,7 +504,7 @@ class UserTest extends TestCase { ->method('deleteUser') ->willReturn($result); $emitter = new PublicEmitter(); - $userId = uniqid('foo', true); + $userId = self::getUniqueID('foo'); $user = new User($userId, $backend, $this->dispatcher, $emitter); /**