mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix setup/teardown

This commit is contained in:
Robin Appelman 2015-08-07 17:38:12 +02:00
parent b0c8654f9e
commit d15870b998
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/lib/connector/sabre/requesttest/requesttest.php
View File

@ -9,6 +9,7 @@
namespace Test\Connector\Sabre\RequestTest; namespace Test\Connector\Sabre\RequestTest;
use OC\Connector\Sabre\Server; use OC\Connector\Sabre\Server;
use OC\Connector\Sabre\ServerFactory;
use OC\Files\Mount\MountPoint; use OC\Files\Mount\MountPoint;
use OC\Files\Storage\Temporary; use OC\Files\Storage\Temporary;
use OC\Files\View; use OC\Files\View;
@ -27,6 +28,11 @@ abstract class RequestTest extends TestCase {
*/ */
protected $mountProviders; protected $mountProviders;
/**
* @var \OC\Connector\Sabre\ServerFactory
*/
protected $serverFactory;
protected function getStream($string) { protected function getStream($string) {
$stream = fopen('php://temp', 'r+'); $stream = fopen('php://temp', 'r+');
fwrite($stream, $string); fwrite($stream, $string);
@ -58,11 +64,22 @@ abstract class RequestTest extends TestCase {
} }
protected function setUp() { protected function setUp() {
parent::setUp();
$this->userBackend = new \OC_User_Dummy(); $this->userBackend = new \OC_User_Dummy();
\OC::$server->getUserManager()->registerBackend($this->userBackend); \OC::$server->getUserManager()->registerBackend($this->userBackend);
$this->serverFactory = new ServerFactory(
\OC::$server->getConfig(),
\OC::$server->getLogger(),
\OC::$server->getDatabaseConnection(),
\OC::$server->getUserSession(),
\OC::$server->getMountManager(),
\OC::$server->getTagManager()
);
} }
protected function tearDown() { protected function tearDown() {
parent::tearDown();
\OC::$server->getUserManager()->removeBackend($this->userBackend); \OC::$server->getUserManager()->removeBackend($this->userBackend);
} }
@ -134,19 +151,9 @@ abstract class RequestTest extends TestCase {
* @return Server * @return Server
*/ */
protected function getSabreServer(View $view, $user, $password, ExceptionPlugin $exceptionPlugin) { protected function getSabreServer(View $view, $user, $password, ExceptionPlugin $exceptionPlugin) {
$serverFactory = new \OC\Connector\Sabre\ServerFactory(
\OC::$server->getConfig(),
\OC::$server->getLogger(),
\OC::$server->getDatabaseConnection(),
\OC::$server->getUserSession(),
\OC::$server->getMountManager(),
\OC::$server->getTagManager()
);
$authBackend = new Auth($user, $password); $authBackend = new Auth($user, $password);
$server = $serverFactory->createServer('/', 'dummy', $authBackend, function () use ($view) { $server = $this->serverFactory->createServer('/', 'dummy', $authBackend, function () use ($view) {
return $view; return $view;
}); });
$server->addPlugin($exceptionPlugin); $server->addPlugin($exceptionPlugin);