wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjust tests

Browse source 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2019-11-29 13:30:25 +01:00 committed by Backportbot
parent b7a6a9d4a2
commit ad41056865
2 changed files with 11 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/user_ldap/tests/Group_LDAPTest.php
View file

@ -1054,7 +1054,7 @@ class Group_LDAPTest extends TestCase {
$ldap = new GroupLDAP($access, $pluginManager); $ldap = new GroupLDAP($access, $pluginManager);
$resultingMembers = $this->invokePrivate($ldap, '_groupMembers', [$groupDN]); $resultingMembers = $this->invokePrivate($ldap, '_groupMembers', [$groupDN]);
$this->assertEquals($expectedMembers, $resultingMembers, '', 0.0, 10, true); $this->assertEqualsCanonicalizing($expectedMembers, $resultingMembers);
} }
public function displayNameProvider() { public function displayNameProvider() {

45
apps/user_ldap/tests/User_LDAPTest.php
View file

@ -499,18 +499,7 @@ class User_LDAPTest extends TestCase {
$this->prepareMockForUserExists(); $this->prepareMockForUserExists();
$user = $this->createMock(User::class); $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()) $this->userManager->expects($this->atLeastOnce())
->method('get') ->method('get')
->willReturn($user); ->willReturn($user);
@ -534,32 +523,18 @@ class User_LDAPTest extends TestCase {
->with('dnOfFormerUser,dc=test') ->with('dnOfFormerUser,dc=test')
->willReturn('45673458748'); ->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()) $this->access->expects($this->any())
->method('getUserMapper') ->method('getUserMapper')
->willReturn($mapper); ->willReturn($mapper);
$this->access->expects($this->once())
->method('getUserDnByUuid')
->willThrowException(new \Exception());
$user = $this->createMock(User::class); $user = $this->createMock(User::class);
$user->expects($this->any())
->method('getDN')
->willReturn('dnOfFormerUser,dc=test');
$this->userManager->expects($this->atLeastOnce()) $this->userManager->expects($this->atLeastOnce())
->method('get') ->method('get')
->willReturn($user); ->willReturn($user);
//test for deleted user //test for deleted user – always returns true as long as we have the user in DB
$this->assertFalse($backend->userExists('formerUser')); $this->assertTrue($backend->userExists('formerUser'));
} }
public function testUserExistsForNeverExisting() { public function testUserExistsForNeverExisting() {
@ -646,8 +621,8 @@ class User_LDAPTest extends TestCase {
->method('get') ->method('get')
->willReturn($user); ->willReturn($user);
//test for deleted user //test for deleted user – always returns true as long as we have the user in DB
$this->assertFalse(\OC::$server->getUserManager()->userExists('formerUser')); $this->assertTrue(\OC::$server->getUserManager()->userExists('formerUser'));
} }
public function testUserExistsPublicAPIForNeverExisting() { public function testUserExistsPublicAPIForNeverExisting() {
@ -777,7 +752,7 @@ class User_LDAPTest extends TestCase {
$this->assertEquals($dataDir.'/susannah/', $result); $this->assertEquals($dataDir.'/susannah/', $result);
} }
public function testGetHomeNoPath() { public function testGetHomeNoPath() {
$this->expectException(\Exception::class); $this->expectException(\Exception::class);
@ -1101,7 +1076,7 @@ class User_LDAPTest extends TestCase {
->willReturn(42); ->willReturn(42);
$this->assertEquals($this->backend->countUsers(),42); $this->assertEquals($this->backend->countUsers(),42);
} }
public function testLoginName2UserNameSuccess() { public function testLoginName2UserNameSuccess() {
$loginName = 'Alice'; $loginName = 'Alice';
@ -1269,7 +1244,7 @@ class User_LDAPTest extends TestCase {
})); }));
} }
public function testSetPasswordInvalid() { public function testSetPasswordInvalid() {
$this->expectException(\OC\HintException::class); $this->expectException(\OC\HintException::class);
$this->expectExceptionMessage('Password fails quality checking policy'); $this->expectExceptionMessage('Password fails quality checking policy');
@ -1283,7 +1258,7 @@ class User_LDAPTest extends TestCase {
$this->assertTrue(\OC_User::setPassword('roland', 'dt')); $this->assertTrue(\OC_User::setPassword('roland', 'dt'));
} }
public function testSetPasswordValid() { public function testSetPasswordValid() {
$this->prepareAccessForSetPassword($this->access); $this->prepareAccessForSetPassword($this->access);
@ -1313,7 +1288,7 @@ class User_LDAPTest extends TestCase {
$this->assertFalse(\OC_User::setPassword('roland', 'dt12234$')); $this->assertFalse(\OC_User::setPassword('roland', 'dt12234$'));
} }
public function testSetPasswordWithInvalidUser() { public function testSetPasswordWithInvalidUser() {
$this->expectException(\Exception::class); $this->expectException(\Exception::class);
$this->expectExceptionMessage('LDAP setPassword: Could not get user object for uid NotExistingUser. Maybe the LDAP entry has no set display name attribute?'); $this->expectExceptionMessage('LDAP setPassword: Could not get user object for uid NotExistingUser. Maybe the LDAP entry has no set display name attribute?');
@ -1414,7 +1389,7 @@ class User_LDAPTest extends TestCase {
$this->assertEquals($newDisplayName, $this->backend->setDisplayName('uid', $newDisplayName)); $this->assertEquals($newDisplayName, $this->backend->setDisplayName('uid', $newDisplayName));
} }
public function testSetDisplayNameErrorWithPlugin() { public function testSetDisplayNameErrorWithPlugin() {
$this->expectException(\OC\HintException::class); $this->expectException(\OC\HintException::class);