open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move dummy backend to Tests namespace

Browse Source
remotes/origin/db-empty-migrate
Lukas Reschke 11 years ago
parent 67231ed9a7
commit 36ce254ffd
26 changed files with 121 additions and 117 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      apps/files_sharing/tests/locking.php
  2. 2
      apps/files_sharing/tests/testcase.php
  3. 2
      apps/files_versions/tests/versions.php
  4. 4
      lib/private/user.php
  5. 2
      tests/lib/cache/file.php
  6. 4
      tests/lib/files/etagtest.php
  7. 4
      tests/lib/files/filesystem.php
  8. 2
      tests/lib/files/node/file.php
  9. 2
      tests/lib/files/node/folder.php
  10. 2
      tests/lib/files/node/integration.php
  11. 2
      tests/lib/files/node/node.php
  12. 2
      tests/lib/files/node/root.php
  13. 4
      tests/lib/files/utils/scanner.php
  14. 2
      tests/lib/files/view.php
  15. 6
      tests/lib/group.php
  16. 2
      tests/lib/preview.php
  17. 2
      tests/lib/preview/provider.php
  18. 4
      tests/lib/traits/usertrait.php
  19. 2
      tests/lib/user.php
  20. 2
      tests/lib/user/avataruserdummy.php
  21. 2
      tests/lib/user/dummy.php
  22. 92
      tests/lib/user/manager.php
  23. 22
      tests/lib/user/session.php
  24. 24
      tests/lib/user/user.php
  25. 6
      tests/lib/util/user/dummy.php
  26. 36
      tests/settings/controller/userscontrollertest.php

4
apps/files_sharing/tests/locking.php
Unescape View File

@ -30,7 +30,7 @@ use OCP\Lock\ILockingProvider;
class Locking extends TestCase {
/**
* @var \OC_User_Dummy
* @var \Test\Util\User\Dummy
*/
private $userBackend;
@ -40,7 +40,7 @@ class Locking extends TestCase {
public function setUp() {
parent::setUp();
$this->userBackend = new \OC_User_Dummy();
$this->userBackend = new \Test\Util\User\Dummy();
\OC::$server->getUserManager()->registerBackend($this->userBackend);
$this->ownerUid = $this->getUniqueID('owner_');

2
apps/files_sharing/tests/testcase.php
Unescape View File

@ -72,7 +72,7 @@ abstract class TestCase extends \Test\TestCase {
\OC::registerShareHooks();
// create users
$backend = new \OC_User_Dummy();
$backend = new \Test\Util\User\Dummy();
\OC_User::useBackend($backend);
$backend->createUser(self::TEST_FILES_SHARING_API_USER1, self::TEST_FILES_SHARING_API_USER1);
$backend->createUser(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_USER2);

2
apps/files_versions/tests/versions.php
Unescape View File

@ -749,7 +749,7 @@ class Test_Files_Versioning extends \Test\TestCase {
public static function loginHelper($user, $create = false) {
if ($create) {
$backend = new \OC_User_Dummy();
$backend = new \Test\Util\User\Dummy();
$backend->createUser($user, $user);
\OC::$server->getUserManager()->registerBackend($backend);
}

4
lib/private/user.php
Unescape View File

@ -146,6 +146,10 @@ class OC_User {
self::$_usedBackends[$backend] = new OC_User_Database();
self::getManager()->registerBackend(self::$_usedBackends[$backend]);
break;
case 'dummy':
self::$_usedBackends[$backend] = new \Test\Util\User\Dummy();
self::getManager()->registerBackend(self::$_usedBackends[$backend]);
break;
default:
\OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', \OCP\Util::DEBUG);
$className = 'OC_USER_' . strToUpper($backend);

2
tests/lib/cache/file.php vendored
Unescape View File

@ -60,7 +60,7 @@ class FileCache extends \Test_Cache {
\OC_Config::setValue('cachedirectory', $datadir);
\OC_User::clearBackends();
\OC_User::useBackend(new \OC_User_Dummy());
\OC_User::useBackend(new \Test\Util\User\Dummy());
//login
\OC_User::createUser('test', 'test');

4
tests/lib/files/etagtest.php
Unescape View File

@ -17,7 +17,7 @@ class EtagTest extends \Test\TestCase {
private $tmpDir;
/**
* @var \OC_User_Dummy $userBackend
* @var \Test\Util\User\Dummy $userBackend
*/
private $userBackend;
@ -35,7 +35,7 @@ class EtagTest extends \Test\TestCase {
$this->tmpDir = \OC_Helper::tmpFolder();
\OC_Config::setValue('datadirectory', $this->tmpDir);
$this->userBackend = new \OC_User_Dummy();
$this->userBackend = new \Test\Util\User\Dummy();
\OC_User::useBackend($this->userBackend);
}

4
tests/lib/files/filesystem.php
Unescape View File

@ -72,7 +72,7 @@ class Filesystem extends \Test\TestCase {
protected function setUp() {
parent::setUp();
$userBackend = new \OC_User_Dummy();
$userBackend = new \Test\Util\User\Dummy();
$userBackend->createUser(self::TEST_FILESYSTEM_USER1, self::TEST_FILESYSTEM_USER1);
$userBackend->createUser(self::TEST_FILESYSTEM_USER2, self::TEST_FILESYSTEM_USER2);
\OC::$server->getUserManager()->registerBackend($userBackend);
@ -274,7 +274,7 @@ class Filesystem extends \Test\TestCase {
$user = \OC_User::getUser();
} else {
$user = self::TEST_FILESYSTEM_USER1;
$backend = new \OC_User_Dummy();
$backend = new \Test\Util\User\Dummy();
\OC_User::useBackend($backend);
$backend->createUser($user, $user);
$userObj = \OC::$server->getUserManager()->get($user);

2
tests/lib/files/node/file.php
Unescape View File

@ -18,7 +18,7 @@ class File extends \Test\TestCase {
protected function setUp() {
parent::setUp();
$this->user = new \OC\User\User('', new \OC_User_Dummy);
$this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
}
protected function getFileInfo($data) {

2
tests/lib/files/node/folder.php
Unescape View File

@ -21,7 +21,7 @@ class Folder extends \Test\TestCase {
protected function setUp() {
parent::setUp();
$this->user = new \OC\User\User('', new \OC_User_Dummy);
$this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
}
protected function getFileInfo($data) {

2
tests/lib/files/node/integration.php
Unescape View File

@ -36,7 +36,7 @@ class IntegrationTests extends \Test\TestCase {
\OC_Hook::clear('OC_Filesystem');
$user = new User($this->getUniqueID('user'), new \OC_User_Dummy);
$user = new User($this->getUniqueID('user'), new \Test\Util\User\Dummy);
$this->loginAsUser($user->getUID());
$this->view = new View();

2
tests/lib/files/node/node.php
Unescape View File

@ -15,7 +15,7 @@ class Node extends \Test\TestCase {
protected function setUp() {
parent::setUp();
$this->user = new \OC\User\User('', new \OC_User_Dummy);
$this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
}
protected function getFileInfo($data) {

2
tests/lib/files/node/root.php
Unescape View File

@ -17,7 +17,7 @@ class Root extends \Test\TestCase {
protected function setUp() {
parent::setUp();
$this->user = new \OC\User\User('', new \OC_User_Dummy);
$this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
}
protected function getFileInfo($data) {

4
tests/lib/files/utils/scanner.php
Unescape View File

@ -42,14 +42,14 @@ class TestScanner extends \OC\Files\Utils\Scanner {
class Scanner extends \Test\TestCase {
/**
* @var \OC_User_Dummy
* @var \Test\Util\User\Dummy
*/
private $userBackend;
protected function setUp() {
parent::setUp();
$this->userBackend = new \OC_User_Dummy();
$this->userBackend = new \Test\Util\User\Dummy();
\OC::$server->getUserManager()->registerBackend($this->userBackend);
$this->loginAsUser();
}

2
tests/lib/files/view.php
Unescape View File

@ -68,7 +68,7 @@ class View extends \Test\TestCase {
\OC_Hook::clear();
\OC_User::clearBackends();
\OC_User::useBackend(new \OC_User_Dummy());
\OC_User::useBackend(new \Test\Util\User\Dummy());
//login
$userManager = \OC::$server->getUserManager();

6
tests/lib/group.php
Unescape View File

@ -30,7 +30,7 @@ class Test_Group extends \Test\TestCase {
}
public function testSingleBackend() {
$userBackend = new \OC_User_Dummy();
$userBackend = new \Test\Util\User\Dummy();
\OC_User::getManager()->registerBackend($userBackend);
OC_Group::useBackend(new OC_Group_Dummy());
@ -112,7 +112,7 @@ class Test_Group extends \Test\TestCase {
public function testUsersInGroup() {
OC_Group::useBackend(new OC_Group_Dummy());
$userBackend = new \OC_User_Dummy();
$userBackend = new \Test\Util\User\Dummy();
\OC_User::getManager()->registerBackend($userBackend);
$group1 = $this->getUniqueID();
@ -141,7 +141,7 @@ class Test_Group extends \Test\TestCase {
}
public function testMultiBackend() {
$userBackend = new \OC_User_Dummy();
$userBackend = new \Test\Util\User\Dummy();
\OC_User::getManager()->registerBackend($userBackend);
$backend1 = new OC_Group_Dummy();
$backend2 = new OC_Group_Dummy();

2
tests/lib/preview.php
Unescape View File

@ -61,7 +61,7 @@ class Preview extends TestCase {
$userManager = \OC::$server->getUserManager();
$userManager->clearBackends();
$backend = new \OC_User_Dummy();
$backend = new \Test\Util\User\Dummy();
$userManager->registerBackend($backend);
$backend->createUser(self::TEST_PREVIEW_USER1, self::TEST_PREVIEW_USER1);
$this->loginAsUser(self::TEST_PREVIEW_USER1);

2
tests/lib/preview/provider.php
Unescape View File

@ -49,7 +49,7 @@ abstract class Provider extends \Test\TestCase {
$userManager = \OC::$server->getUserManager();
$userManager->clearBackends();
$backend = new \OC_User_Dummy();
$backend = new \Test\Util\User\Dummy();
$userManager->registerBackend($backend);
$userId = $this->getUniqueID();

4
tests/lib/traits/usertrait.php
Unescape View File

@ -13,7 +13,7 @@ namespace Test\Traits;
*/
trait UserTrait {
/**
* @var \OC_User_Dummy|\OCP\UserInterface
* @var \Test\Util\User\Dummy|\OCP\UserInterface
*/
protected $userBackend;
@ -22,7 +22,7 @@ trait UserTrait {
}
protected function setUpUserTrait() {
$this->userBackend = new \OC_User_Dummy();
$this->userBackend = new \Test\Util\User\Dummy();
\OC::$server->getUserManager()->registerBackend($this->userBackend);
}

2
tests/lib/user.php
Unescape View File

@ -18,7 +18,7 @@ class User extends TestCase {
protected function setUp(){
parent::setUp();
$this->backend = $this->getMock('\OC_User_Dummy');
$this->backend = $this->getMock('\Test\Util\User\Dummy');
$manager = \OC_User::getManager();
$manager->registerBackend($this->backend);
}

2
tests/lib/user/avataruserdummy.php
Unescape View File

@ -20,7 +20,7 @@
*
*/
class Avatar_User_Dummy extends \OC_User_Dummy {
class Avatar_User_Dummy extends \Test\Util\User\Dummy {
public function canChangeAvatar($uid) {
return true;
}

2
tests/lib/user/dummy.php
Unescape View File

@ -23,6 +23,6 @@
class Test_User_Dummy extends Test_User_Backend {
protected function setUp() {
parent::setUp();
$this->backend=new OC_User_Dummy();
$this->backend=new \Test\Util\User\Dummy();
}
}

92
tests/lib/user/manager.php
Unescape View File

@ -11,7 +11,7 @@ namespace Test\User;
class Manager extends \Test\TestCase {
public function testGetBackends() {
$userDummyBackend = $this->getMock('\OC_User_Dummy');
$userDummyBackend = $this->getMock('\Test\Util\User\Dummy');
$manager = new \OC\User\Manager();
$manager->registerBackend($userDummyBackend);
$this->assertEquals([$userDummyBackend], $manager->getBackends());
@ -23,9 +23,9 @@ class Manager extends \Test\TestCase {
public function testUserExistsSingleBackendExists() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
@ -39,9 +39,9 @@ class Manager extends \Test\TestCase {
public function testUserExistsSingleBackendNotExists() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
@ -61,18 +61,18 @@ class Manager extends \Test\TestCase {
public function testUserExistsTwoBackendsSecondExists() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
*/
$backend1 = $this->getMock('\OC_User_Dummy');
$backend1 = $this->getMock('\Test\Util\User\Dummy');
$backend1->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
->will($this->returnValue(false));
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
*/
$backend2 = $this->getMock('\OC_User_Dummy');
$backend2 = $this->getMock('\Test\Util\User\Dummy');
$backend2->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
@ -87,18 +87,18 @@ class Manager extends \Test\TestCase {
public function testUserExistsTwoBackendsFirstExists() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
*/
$backend1 = $this->getMock('\OC_User_Dummy');
$backend1 = $this->getMock('\Test\Util\User\Dummy');
$backend1->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
->will($this->returnValue(true));
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
*/
$backend2 = $this->getMock('\OC_User_Dummy');
$backend2 = $this->getMock('\Test\Util\User\Dummy');
$backend2->expects($this->never())
->method('userExists');
@ -113,7 +113,7 @@ class Manager extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('checkPassword')
->with($this->equalTo('foo'), $this->equalTo('bar'))
@ -140,7 +140,7 @@ class Manager extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->never())
->method('checkPassword');
@ -156,9 +156,9 @@ class Manager extends \Test\TestCase {
public function testGetOneBackendExists() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
@ -172,9 +172,9 @@ class Manager extends \Test\TestCase {
public function testGetOneBackendNotExists() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
@ -188,9 +188,9 @@ class Manager extends \Test\TestCase {
public function testSearchOneBackend() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('getUsers')
->with($this->equalTo('fo'))
@ -207,18 +207,18 @@ class Manager extends \Test\TestCase {
public function testSearchTwoBackendLimitOffset() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
*/
$backend1 = $this->getMock('\OC_User_Dummy');
$backend1 = $this->getMock('\Test\Util\User\Dummy');
$backend1->expects($this->once())
->method('getUsers')
->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1))
->will($this->returnValue(array('foo1', 'foo2')));
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
*/
$backend2 = $this->getMock('\OC_User_Dummy');
$backend2 = $this->getMock('\Test\Util\User\Dummy');
$backend2->expects($this->once())
->method('getUsers')
->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1))
@ -237,9 +237,9 @@ class Manager extends \Test\TestCase {
public function testCreateUserSingleBackendNotExists() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
->will($this->returnValue(true));
@ -265,9 +265,9 @@ class Manager extends \Test\TestCase {
*/
public function testCreateUserSingleBackendExists() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
->will($this->returnValue(true));
@ -288,9 +288,9 @@ class Manager extends \Test\TestCase {
public function testCreateUserSingleBackendNotSupported() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
->will($this->returnValue(false));
@ -320,9 +320,9 @@ class Manager extends \Test\TestCase {
*/
public function testCreateUserTwoBackendExists() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
*/
$backend1 = $this->getMock('\OC_User_Dummy');
$backend1 = $this->getMock('\Test\Util\User\Dummy');
$backend1->expects($this->any())
->method('implementsActions')
->will($this->returnValue(true));
@ -336,9 +336,9 @@ class Manager extends \Test\TestCase {
->will($this->returnValue(false));
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
*/
$backend2 = $this->getMock('\OC_User_Dummy');
$backend2 = $this->getMock('\Test\Util\User\Dummy');
$backend2->expects($this->any())
->method('implementsActions')
->will($this->returnValue(true));
@ -368,9 +368,9 @@ class Manager extends \Test\TestCase {
public function testCountUsersOneBackend() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('countUsers')
->will($this->returnValue(7));
@ -382,14 +382,14 @@ class Manager extends \Test\TestCase {
$backend->expects($this->once())
->method('getBackendName')
->will($this->returnValue('Mock_OC_User_Dummy'));
->will($this->returnValue('Mock_Test_Util_User_Dummy'));
$manager = new \OC\User\Manager();
$manager->registerBackend($backend);
$result = $manager->countUsers();
$keys = array_keys($result);
$this->assertTrue(strpos($keys[0], 'Mock_OC_User_Dummy') !== false);
$this->assertTrue(strpos($keys[0], 'Mock_Test_Util_User_Dummy') !== false);
$users = array_shift($result);
$this->assertEquals(7, $users);
@ -397,9 +397,9 @@ class Manager extends \Test\TestCase {
public function testCountUsersTwoBackends() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
* @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend1 = $this->getMock('\OC_User_Dummy');
$backend1 = $this->getMock('\Test\Util\User\Dummy');
$backend1->expects($this->once())
->method('countUsers')
->will($this->returnValue(7));
@ -410,9 +410,9 @@ class Manager extends \Test\TestCase {
->will($this->returnValue(true));
$backend1->expects($this->once())
->method('getBackendName')
->will($this->returnValue('Mock_OC_User_Dummy'));
->will($this->returnValue('Mock_Test_Util_User_Dummy'));
$backend2 = $this->getMock('\OC_User_Dummy');
$backend2 = $this->getMock('\Test\Util\User\Dummy');
$backend2->expects($this->once())
->method('countUsers')
->will($this->returnValue(16));
@ -423,7 +423,7 @@ class Manager extends \Test\TestCase {
->will($this->returnValue(true));
$backend2->expects($this->once())
->method('getBackendName')
->will($this->returnValue('Mock_OC_User_Dummy'));
->will($this->returnValue('Mock_Test_Util_User_Dummy'));
$manager = new \OC\User\Manager();
$manager->registerBackend($backend1);
@ -433,7 +433,7 @@ class Manager extends \Test\TestCase {
//because the backends have the same class name, only one value expected
$this->assertEquals(1, count($result));
$keys = array_keys($result);
$this->assertTrue(strpos($keys[0], 'Mock_OC_User_Dummy') !== false);
$this->assertTrue(strpos($keys[0], 'Mock_Test_Util_User_Dummy') !== false);
$users = array_shift($result);
//users from backends shall be summed up
@ -442,7 +442,7 @@ class Manager extends \Test\TestCase {
public function testDeleteUser() {
$manager = new \OC\User\Manager();
$backend = new \OC_User_Dummy();
$backend = new \Test\Util\User\Dummy();
$backend->createUser('foo', 'bar');
$manager->registerBackend($backend);

22
tests/lib/user/session.php
Unescape View File

@ -20,7 +20,7 @@ class Session extends \Test\TestCase {
->with('user_id')
->will($this->returnValue('foo'));
$backend = $this->getMock('OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with('foo')
@ -41,7 +41,7 @@ class Session extends \Test\TestCase {
->with('user_id')
->will($this->returnValue('foo'));
$backend = $this->getMock('OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with('foo')
@ -62,7 +62,7 @@ class Session extends \Test\TestCase {
->with('user_id')
->will($this->returnValue(null));
$backend = $this->getMock('OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->never())
->method('userExists');
@ -82,7 +82,7 @@ class Session extends \Test\TestCase {
$manager = $this->getMock('\OC\User\Manager');
$backend = $this->getMock('OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
$user->expects($this->once())
@ -122,7 +122,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
$backend = $this->getMock('OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
$user->expects($this->once())
@ -161,7 +161,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
$backend = $this->getMock('OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
$user->expects($this->once())
@ -196,7 +196,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
$backend = $this->getMock('OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
$user->expects($this->never())
@ -220,7 +220,7 @@ class Session extends \Test\TestCase {
$manager = $this->getMock('\OC\User\Manager');
$backend = $this->getMock('OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$manager->expects($this->once())
->method('checkPassword')
@ -257,7 +257,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
$backend = $this->getMock('OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
@ -305,7 +305,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
$backend = $this->getMock('OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
@ -347,7 +347,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
$backend = $this->getMock('OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));

24
tests/lib/user/user.php
Unescape View File

@ -74,7 +74,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('setPassword')
->with($this->equalTo('foo'), $this->equalTo('bar'));
@ -97,7 +97,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->never())
->method('setPassword');
@ -182,7 +182,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('deleteUser')
->with($this->equalTo('foo'));
@ -195,7 +195,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('getHome')
->with($this->equalTo('foo'))
@ -216,7 +216,7 @@ class User extends \Test\TestCase {
}
public function testGetBackendClassName() {
$user = new \OC\User\User('foo', new \OC_User_Dummy());
$user = new \OC\User\User('foo', new \Test\Util\User\Dummy());
$this->assertEquals('Dummy', $user->getBackendClassName());
$user = new \OC\User\User('foo', new \OC_User_Database());
$this->assertEquals('Database', $user->getBackendClassName());
@ -226,7 +226,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->never())
->method('getHome');
@ -253,7 +253,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
@ -273,7 +273,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
@ -287,7 +287,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
@ -307,7 +307,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
@ -393,7 +393,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('setPassword');
@ -434,7 +434,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
$backend = $this->getMock('\OC_User_Dummy');
$backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('deleteUser');

6
lib/private/user/dummy.php → tests/lib/util/user/dummy.php
Unescape View File

@ -25,10 +25,14 @@
*
*/
namespace Test\Util\User;
use OC_User_Backend;
/**
* dummy user backend, does not keep state, only for testing use
*/
class OC_User_Dummy extends OC_User_Backend implements \OCP\IUserBackend {
class Dummy extends OC_User_Backend implements \OCP\IUserBackend {
private $users = array();
private $displayNames = array();

36
tests/settings/controller/userscontrollertest.php
Unescape View File

@ -100,7 +100,7 @@ class UsersControllerTest extends \Test\TestCase {
$admin
->expects($this->once())
->method('getBackendClassName')
->will($this->returnValue('OC_User_Dummy'));
->will($this->returnValue('\Test\Util\User\Dummy'));
$bar = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$bar
@ -120,7 +120,7 @@ class UsersControllerTest extends \Test\TestCase {
$bar
->expects($this->once())
->method('getBackendClassName')
->will($this->returnValue('OC_User_Dummy'));
->will($this->returnValue('\Test\Util\User\Dummy'));
$this->container['GroupManager']
->expects($this->once())
@ -175,7 +175,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 404,
'storageLocation' => '/home/admin',
'lastLogin' => 12000,
'backend' => 'OC_User_Dummy',
'backend' => '\Test\Util\User\Dummy',
'email' => 'admin@bar.com',
'isRestoreDisabled' => false,
),
@ -187,7 +187,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 2323,
'storageLocation' => '/home/bar',
'lastLogin' => 3999000,
'backend' => 'OC_User_Dummy',
'backend' => '\Test\Util\User\Dummy',
'email' => 'bar@dummy.com',
'isRestoreDisabled' => false,
),
@ -257,7 +257,7 @@ class UsersControllerTest extends \Test\TestCase {
$admin
->expects($this->once())
->method('getBackendClassName')
->will($this->returnValue('OC_User_Dummy'));
->will($this->returnValue('\Test\Util\User\Dummy'));
$bar = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$bar
@ -277,7 +277,7 @@ class UsersControllerTest extends \Test\TestCase {
$bar
->expects($this->once())
->method('getBackendClassName')
->will($this->returnValue('OC_User_Dummy'));
->will($this->returnValue('\Test\Util\User\Dummy'));
$this->container['GroupManager']
->expects($this->at(0))
@ -343,7 +343,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 404,
'storageLocation' => '/home/admin',
'lastLogin' => 12000,
'backend' => 'OC_User_Dummy',
'backend' => '\Test\Util\User\Dummy',
'email' => 'admin@bar.com',
'isRestoreDisabled' => false,
],
@ -355,7 +355,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 2323,
'storageLocation' => '/home/bar',
'lastLogin' => 3999000,
'backend' => 'OC_User_Dummy',
'backend' => '\Test\Util\User\Dummy',
'email' => 'bar@dummy.com',
'isRestoreDisabled' => false,
],
@ -414,7 +414,7 @@ class UsersControllerTest extends \Test\TestCase {
$admin
->expects($this->once())
->method('getBackendClassName')
->will($this->returnValue('OC_User_Dummy'));
->will($this->returnValue('\Test\Util\User\Dummy'));
$bar = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$bar
@ -434,7 +434,7 @@ class UsersControllerTest extends \Test\TestCase {
$bar
->expects($this->once())
->method('getBackendClassName')
->will($this->returnValue('OC_User_Dummy'));
->will($this->returnValue('\Test\Util\User\Dummy'));
$this->container['UserManager']
->expects($this->once())
@ -474,7 +474,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 404,
'storageLocation' => '/home/admin',
'lastLogin' => 12000,
'backend' => 'OC_User_Dummy',
'backend' => '\Test\Util\User\Dummy',
'email' => 'admin@bar.com',
'isRestoreDisabled' => false,
),
@ -486,7 +486,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 2323,
'storageLocation' => '/home/bar',
'lastLogin' => 3999000,
'backend' => 'OC_User_Dummy',
'backend' => '\Test\Util\User\Dummy',
'email' => 'bar@dummy.com',
'isRestoreDisabled' => false,
),
@ -522,14 +522,10 @@ class UsersControllerTest extends \Test\TestCase {
$this->container['UserManager']
->expects($this->once())
->method('getBackends')
->will($this->returnValue([new \OC_User_Dummy(), new \OC_User_Database()]));
->will($this->returnValue([new \Test\Util\User\Dummy(), new \OC_User_Database()]));
$this->container['UserManager']
->expects($this->once())
->method('clearBackends');
$this->container['UserManager']
->expects($this->once())
->method('registerBackend')
->with(new \OC_User_Dummy());
$this->container['UserManager']
->expects($this->once())
->method('search')
@ -552,7 +548,7 @@ class UsersControllerTest extends \Test\TestCase {
)
)
);
$response = $this->container['UsersController']->index(0, 10, '','', 'OC_User_Dummy');
$response = $this->container['UsersController']->index(0, 10, '','', '\Test\Util\User\Dummy');
$this->assertEquals($expectedResponse, $response);
}
@ -562,7 +558,7 @@ class UsersControllerTest extends \Test\TestCase {
$this->container['UserManager']
->expects($this->once())
->method('getBackends')
->will($this->returnValue([new \OC_User_Dummy(), new \OC_User_Database()]));
->will($this->returnValue([new \Test\Util\User\Dummy(), new \OC_User_Database()]));
$this->container['UserManager']
->expects($this->once())
->method('search')
@ -570,7 +566,7 @@ class UsersControllerTest extends \Test\TestCase {
->will($this->returnValue([]));
$expectedResponse = new DataResponse([]);
$response = $this->container['UsersController']->index(0, 10, '','', 'OC_User_Dummy');
$response = $this->container['UsersController']->index(0, 10, '','', '\Test\Util\User\Dummy');
$this->assertEquals($expectedResponse, $response);
}

Write Preview
Loading…
Cancel
Save