Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>tags/v12.0.0beta1
@@ -25,8 +25,10 @@ namespace OCA\User_LDAP\Tests\Integration; | |||
use OCA\User_LDAP\Access; | |||
use OCA\User_LDAP\Connection; | |||
use OCA\User_LDAP\FilesystemHelper; | |||
use OCA\User_LDAP\LDAP; | |||
use OCA\User_LDAP\Helper; | |||
use OCA\User_LDAP\LogWrapper; | |||
use OCA\User_LDAP\User\Manager; | |||
abstract class AbstractIntegrationTest { | |||
@@ -106,7 +108,15 @@ abstract class AbstractIntegrationTest { | |||
* @return Manager | |||
*/ | |||
protected function initUserManager() { | |||
$this->userManager = new FakeManager(); | |||
$this->userManager = new Manager( | |||
\OC::$server->getConfig(), | |||
new FilesystemHelper(), | |||
new LogWrapper(), | |||
\OC::$server->getAvatarManager(), | |||
new \OCP\Image(), | |||
\OC::$server->getDatabaseConnection(), | |||
\OC::$server->getUserManager() | |||
); | |||
} | |||
/** |
@@ -1,38 +0,0 @@ | |||
<?php | |||
/** | |||
* @copyright Copyright (c) 2016, ownCloud, Inc. | |||
* | |||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de> | |||
* @author Joas Schilling <coding@schilljs.com> | |||
* | |||
* @license AGPL-3.0 | |||
* | |||
* This code is free software: you can redistribute it and/or modify | |||
* it under the terms of the GNU Affero General Public License, version 3, | |||
* as published by the Free Software Foundation. | |||
* | |||
* This program is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
* GNU Affero General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU Affero General Public License, version 3, | |||
* along with this program. If not, see <http://www.gnu.org/licenses/> | |||
* | |||
*/ | |||
namespace OCA\User_LDAP\Tests\Integration; | |||
/** | |||
* Class FakeManager | |||
* | |||
* this is a mock of \OCA\User_LDAP\User\Manager which is a dependency of | |||
* Access, that pulls plenty more things in. Because it is not needed in the | |||
* scope of these tests, we replace it with a mock. | |||
*/ | |||
class FakeManager extends \OCA\User_LDAP\User\Manager { | |||
public function __construct() { | |||
$this->ocConfig = \OC::$server->getConfig(); | |||
$this->image = new \OCP\Image(); | |||
} | |||
} |
@@ -25,6 +25,7 @@ namespace OCA\User_LDAP\Tests\Integration\Lib\User; | |||
use OCA\User_LDAP\Mapping\UserMapping; | |||
use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; | |||
use OCA\User_LDAP\User_LDAP; | |||
require_once __DIR__ . '/../../Bootstrap.php'; | |||
@@ -42,7 +43,7 @@ class IntegrationTestUserDisplayName extends AbstractIntegrationTest { | |||
$this->mapping = new UserMapping(\OC::$server->getDatabaseConnection()); | |||
$this->mapping->clear(); | |||
$this->access->setUserMapper($this->mapping); | |||
$userBackend = new \OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig()); | |||
$userBackend = new User_LDAP($this->access, \OC::$server->getConfig()); | |||
\OC_User::useBackend($userBackend); | |||
} | |||