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

Merge pull request #17229 from owncloud/maintenance-plugin-test 

Unit tests added for MaintenancePlugin
This commit is contained in:
Joas Schilling 2015-06-29 16:22:38 +02:00
parent b56af26199 372a9afabe
commit 30f5fa42e5
4 changed files with 92 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/appinfo/remote.php
View File

@ -50,7 +50,7 @@ $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()
// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
$server->addPlugin(new \OC\Connector\Sabre\DummyGetResponsePlugin());
$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin());
$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
// wait with registering these until auth is handled and the filesystem is setup

2
apps/files_sharing/publicwebdav.php
View File

@ -46,7 +46,7 @@ $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()
// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
$server->addPlugin(new \OC\Connector\Sabre\DummyGetResponsePlugin());
$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin());
$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
// wait with registering these until auth is handled and the filesystem is setup

20
lib/private/connector/sabre/maintenanceplugin.php
View File

@ -25,12 +25,16 @@
namespace OC\Connector\Sabre;
use OCP\IConfig;
use Sabre\DAV\Exception\ServiceUnavailable;
use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin;
class MaintenancePlugin extends ServerPlugin {
/** @var IConfig */
private $config;
/**
* Reference to main server object
*
@ -38,6 +42,17 @@ class MaintenancePlugin extends ServerPlugin {
*/
private $server;
/**
* @param IConfig $config
*/
public function __construct(IConfig $config = null) {
$this->config = $config;
if (is_null($config)) {
$this->config = \OC::$server->getConfig();
}
}
/**
* This initializes the plugin.
*
@ -59,14 +74,13 @@ class MaintenancePlugin extends ServerPlugin {
* in case the system is in maintenance mode.
*
* @throws ServiceUnavailable
* @internal param string $method
* @return bool
*/
public function checkMaintenanceMode() {
if (\OC::$server->getSystemConfig()->getValue('singleuser', false)) {
if ($this->config->getSystemValue('singleuser', false)) {
throw new ServiceUnavailable('System in single user mode.');
}
if (\OC::$server->getSystemConfig()->getValue('maintenance', false)) {
if ($this->config->getSystemValue('maintenance', false)) {
throw new ServiceUnavailable('System in maintenance mode.');
}
if (\OC::checkUpgrade(false)) {

73
tests/lib/connector/sabre/MaintenancePluginTest.php Normal file
View File

@ -0,0 +1,73 @@
<?php
/**
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @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 Test\Connector\Sabre;
use OC\Connector\Sabre\MaintenancePlugin;
use Test\TestCase;
use OCP\IConfig;
/**
* Class MaintenancePluginTest
*
* @package Test\Connector\Sabre
*/
class MaintenancePluginTest extends TestCase {
/** @var IConfig */
private $config;
/** @var MaintenancePlugin */
private $maintenancePlugin;
public function setUp() {
parent::setUp();
$this->config = $this->getMock('\OCP\IConfig');
$this->maintenancePlugin = new MaintenancePlugin($this->config);
}
/**
* @expectedException \Sabre\DAV\Exception\ServiceUnavailable
* @expectedExceptionMessage System in single user mode.
*/
public function testSingleUserMode() {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('singleuser', false)
->will($this->returnValue(true));
$this->maintenancePlugin->checkMaintenanceMode();
}
/**
* @expectedException \Sabre\DAV\Exception\ServiceUnavailable
* @expectedExceptionMessage System in single user mode.
*/
public function testMaintenanceMode() {
$this->config
->expects($this->exactly(1))
->method('getSystemValue')
->will($this->onConsecutiveCalls([false, true]));
$this->maintenancePlugin->checkMaintenanceMode();
}
}