adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
parent
b7a6a9d4a2
commit
ad41056865
2 changed files with 11 additions and 36 deletions
|
@ -1054,7 +1054,7 @@ class Group_LDAPTest extends TestCase {
|
|||
$ldap = new GroupLDAP($access, $pluginManager);
|
||||
$resultingMembers = $this->invokePrivate($ldap, '_groupMembers', [$groupDN]);
|
||||
|
||||
$this->assertEquals($expectedMembers, $resultingMembers, '', 0.0, 10, true);
|
||||
$this->assertEqualsCanonicalizing($expectedMembers, $resultingMembers);
|
||||
}
|
||||
|
||||
public function displayNameProvider() {
|
||||
|
|
|
@ -499,18 +499,7 @@ class User_LDAPTest extends TestCase {
|
|||
$this->prepareMockForUserExists();
|
||||
|
||||
$user = $this->createMock(User::class);
|
||||
$user->expects($this->any())
|
||||
->method('getDN')
|
||||
->willReturn('dnOfRoland,dc=test');
|
||||
|
||||
$this->access->expects($this->any())
|
||||
->method('readAttribute')
|
||||
->will($this->returnCallback(function($dn) {
|
||||
if($dn === 'dnOfRoland,dc=test') {
|
||||
return array();
|
||||
}
|
||||
return false;
|
||||
}));
|
||||
$this->userManager->expects($this->atLeastOnce())
|
||||
->method('get')
|
||||
->willReturn($user);
|
||||
|
@ -534,32 +523,18 @@ class User_LDAPTest extends TestCase {
|
|||
->with('dnOfFormerUser,dc=test')
|
||||
->willReturn('45673458748');
|
||||
|
||||
$this->access->expects($this->any())
|
||||
->method('readAttribute')
|
||||
->will($this->returnCallback(function($dn) {
|
||||
if($dn === 'dnOfRoland,dc=test') {
|
||||
return array();
|
||||
}
|
||||
return false;
|
||||
}));
|
||||
$this->access->expects($this->any())
|
||||
->method('getUserMapper')
|
||||
->willReturn($mapper);
|
||||
$this->access->expects($this->once())
|
||||
->method('getUserDnByUuid')
|
||||
->willThrowException(new \Exception());
|
||||
|
||||
$user = $this->createMock(User::class);
|
||||
$user->expects($this->any())
|
||||
->method('getDN')
|
||||
->willReturn('dnOfFormerUser,dc=test');
|
||||
|
||||
$this->userManager->expects($this->atLeastOnce())
|
||||
->method('get')
|
||||
->willReturn($user);
|
||||
|
||||
//test for deleted user
|
||||
$this->assertFalse($backend->userExists('formerUser'));
|
||||
//test for deleted user – always returns true as long as we have the user in DB
|
||||
$this->assertTrue($backend->userExists('formerUser'));
|
||||
}
|
||||
|
||||
public function testUserExistsForNeverExisting() {
|
||||
|
@ -646,8 +621,8 @@ class User_LDAPTest extends TestCase {
|
|||
->method('get')
|
||||
->willReturn($user);
|
||||
|
||||
//test for deleted user
|
||||
$this->assertFalse(\OC::$server->getUserManager()->userExists('formerUser'));
|
||||
//test for deleted user – always returns true as long as we have the user in DB
|
||||
$this->assertTrue(\OC::$server->getUserManager()->userExists('formerUser'));
|
||||
}
|
||||
|
||||
public function testUserExistsPublicAPIForNeverExisting() {
|
||||
|
|
Loading…
Reference in a new issue