fix and tidy up tests after merge conflicts
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
parent
c4fcd1f282
commit
a49d571799
|
@ -27,9 +27,12 @@
|
||||||
namespace OCA\User_LDAP\Tests;
|
namespace OCA\User_LDAP\Tests;
|
||||||
|
|
||||||
use OCA\User_LDAP\Access;
|
use OCA\User_LDAP\Access;
|
||||||
|
use OCA\User_LDAP\Connection;
|
||||||
use OCA\User_LDAP\FilesystemHelper;
|
use OCA\User_LDAP\FilesystemHelper;
|
||||||
|
use OCA\User_LDAP\Helper;
|
||||||
use OCA\User_LDAP\ILDAPWrapper;
|
use OCA\User_LDAP\ILDAPWrapper;
|
||||||
use OCA\User_LDAP\LogWrapper;
|
use OCA\User_LDAP\LogWrapper;
|
||||||
|
use OCA\User_LDAP\User\Manager;
|
||||||
use OCP\IAvatarManager;
|
use OCP\IAvatarManager;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use OCP\IDBConnection;
|
use OCP\IDBConnection;
|
||||||
|
@ -45,32 +48,21 @@ use OCP\IUserManager;
|
||||||
*/
|
*/
|
||||||
class AccessTest extends \Test\TestCase {
|
class AccessTest extends \Test\TestCase {
|
||||||
private function getConnectorAndLdapMock() {
|
private function getConnectorAndLdapMock() {
|
||||||
static $conMethods;
|
|
||||||
static $accMethods;
|
|
||||||
static $umMethods;
|
|
||||||
|
|
||||||
if(is_null($conMethods) || is_null($accMethods)) {
|
|
||||||
$conMethods = get_class_methods('\OCA\User_LDAP\Connection');
|
|
||||||
$accMethods = get_class_methods('\OCA\User_LDAP\Access');
|
|
||||||
$umMethods = get_class_methods('\OCA\User_LDAP\User\Manager');
|
|
||||||
}
|
|
||||||
$lw = $this->createMock(ILDAPWrapper::class);
|
$lw = $this->createMock(ILDAPWrapper::class);
|
||||||
$connector = $this->getMockBuilder('\OCA\User_LDAP\Connection')
|
$connector = $this->getMockBuilder(Connection::class)
|
||||||
->setMethods($conMethods)
|
|
||||||
->setConstructorArgs([$lw, null, null])
|
->setConstructorArgs([$lw, null, null])
|
||||||
->getMock();
|
->getMock();
|
||||||
$um = $this->getMockBuilder('\OCA\User_LDAP\User\Manager')
|
$um = $this->getMockBuilder(Manager::class)
|
||||||
|
->setConstructorArgs([
|
||||||
$this->createMock(IConfig::class),
|
$this->createMock(IConfig::class),
|
||||||
$this->createMock(FilesystemHelper::class),
|
$this->createMock(FilesystemHelper::class),
|
||||||
$this->createMock(LogWrapper::class),
|
$this->createMock(LogWrapper::class),
|
||||||
$this->createMock(IAvatarManager::class),
|
$this->createMock(IAvatarManager::class),
|
||||||
$this->createMock(Image::class),
|
$this->createMock(Image::class),
|
||||||
$this->createMock(IDBConnection::class),
|
$this->createMock(IDBConnection::class),
|
||||||
$this->createMock(IUserManager::class)));
|
$this->createMock(IUserManager::class)])
|
||||||
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
|
|
||||||
$this->createMock('\OCP\IUserManager')
|
|
||||||
])
|
|
||||||
->getMock();
|
->getMock();
|
||||||
|
$helper = new Helper(\OC::$server->getConfig());
|
||||||
|
|
||||||
return array($lw, $connector, $um, $helper);
|
return array($lw, $connector, $um, $helper);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue