[Pkg-owncloud-commits] [owncloud] 77/215: Add unit tests for the commands

David Prévot taffit at moszumanska.debian.org
Tue May 5 01:01:25 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit e4977841b4fbdedb0d854ff37a335d8ec6085b04
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Thu Apr 23 17:09:43 2015 +0200

    Add unit tests for the commands
---
 core/command/encryption/setdefaultmodule.php       | 12 +--
 tests/core/command/encryption/disabletest.php      | 85 +++++++++++++++++++
 tests/core/command/encryption/enabletest.php       | 97 ++++++++++++++++++++++
 .../command/encryption/setdefaultmoduletest.php    | 92 ++++++++++++++++++++
 4 files changed, 280 insertions(+), 6 deletions(-)

diff --git a/core/command/encryption/setdefaultmodule.php b/core/command/encryption/setdefaultmodule.php
index f33762e..a605b47 100644
--- a/core/command/encryption/setdefaultmodule.php
+++ b/core/command/encryption/setdefaultmodule.php
@@ -22,20 +22,20 @@
 namespace OC\Core\Command\Encryption;
 
 
-use OC\Encryption\Manager;
+use OCP\Encryption\IManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetDefaultModule extends Command {
-	/** @var Manager */
+	/** @var IManager */
 	protected $encryptionManager;
 
 	/**
-	 * @param Manager $encryptionManager
+	 * @param IManager $encryptionManager
 	 */
-	public function __construct(Manager $encryptionManager) {
+	public function __construct(IManager $encryptionManager) {
 		parent::__construct();
 		$this->encryptionManager = $encryptionManager;
 	}
@@ -60,9 +60,9 @@ class SetDefaultModule extends Command {
 		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
 			$output->writeln('"' . $moduleId . '"" is already the default module');
 		} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
-			$output->writeln('Set default module to "' . $moduleId . '"');
+			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
 		} else {
-			$output->writeln('The specified module "' . $moduleId . '" does not exist');
+			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
 		}
 	}
 }
diff --git a/tests/core/command/encryption/disabletest.php b/tests/core/command/encryption/disabletest.php
new file mode 100644
index 0000000..48a6539
--- /dev/null
+++ b/tests/core/command/encryption/disabletest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ *
+ * @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 Tests\Core\Command\Encryption;
+
+
+use OC\Core\Command\Encryption\Disable;
+use Test\TestCase;
+
+class DisableTest extends TestCase {
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $config;
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleInput;
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleOutput;
+
+	/** @var \Symfony\Component\Console\Command\Command */
+	protected $command;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$config = $this->config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+		$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+
+		/** @var \OCP\IConfig $config */
+		$this->command = new Disable($config);
+	}
+
+
+	public function dataDisable() {
+		return [
+			['yes', true, 'Encryption disabled'],
+			['no', false, 'Encryption is already disabled'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataDisable
+	 *
+	 * @param string $oldStatus
+	 * @param bool $isUpdating
+	 * @param string $expectedString
+	 */
+	public function testDisable($oldStatus, $isUpdating, $expectedString) {
+		$this->config->expects($this->once())
+			->method('getAppValue')
+			->with('core', 'encryption_enabled', $this->anything())
+			->willReturn($oldStatus);
+
+		$this->consoleOutput->expects($this->once())
+			->method('writeln')
+			->with($expectedString);
+
+		if ($isUpdating) {
+			$this->config->expects($this->once())
+				->method('setAppValue')
+				->with('core', 'encryption_enabled', 'no');
+		}
+
+		\Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+}
diff --git a/tests/core/command/encryption/enabletest.php b/tests/core/command/encryption/enabletest.php
new file mode 100644
index 0000000..217329c
--- /dev/null
+++ b/tests/core/command/encryption/enabletest.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ *
+ * @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 Tests\Core\Command\Encryption;
+
+
+use OC\Core\Command\Encryption\Enable;
+use Test\TestCase;
+
+class EnableTest extends TestCase {
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $config;
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleInput;
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleOutput;
+
+	/** @var \Symfony\Component\Console\Command\Command */
+	protected $command;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$config = $this->config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+		$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+
+		/** @var \OCP\IConfig $config */
+		$this->command = new Enable($config);
+	}
+
+
+	public function dataEnable() {
+		return [
+			['no', true, 'Encryption enabled'],
+			['yes', false, 'Encryption is already enabled'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataEnable
+	 *
+	 * @param string $oldStatus
+	 * @param bool $isUpdating
+	 * @param string $expectedString
+	 */
+	public function testEnable($oldStatus, $isUpdating, $expectedString) {
+		$invoceCount = 0;
+		$this->config->expects($this->at($invoceCount))
+			->method('getAppValue')
+			->with('core', 'encryption_enabled', $this->anything())
+			->willReturn($oldStatus);
+		$invoceCount++;
+
+		if ($isUpdating) {
+			$this->config->expects($this->once())
+				->method('setAppValue')
+				->with('core', 'encryption_enabled', 'yes');
+			$invoceCount++;
+		}
+
+		$this->config->expects($this->at($invoceCount))
+			->method('getAppValue')
+			->with('core', 'default_encryption_module', $this->anything())
+			->willReturnArgument(2);
+
+		$this->consoleOutput->expects($this->at(0))
+			->method('writeln')
+			->with($expectedString);
+
+		$this->consoleOutput->expects($this->at(1))
+			->method('writeln')
+			->with($this->stringContains('Default module'));
+
+		\Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+}
diff --git a/tests/core/command/encryption/setdefaultmoduletest.php b/tests/core/command/encryption/setdefaultmoduletest.php
new file mode 100644
index 0000000..e2a61dd
--- /dev/null
+++ b/tests/core/command/encryption/setdefaultmoduletest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ *
+ * @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 Tests\Core\Command\Encryption;
+
+
+use OC\Core\Command\Encryption\SetDefaultModule;
+use Test\TestCase;
+
+class SetDefaultModuleTest extends TestCase {
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $manager;
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleInput;
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleOutput;
+
+	/** @var \Symfony\Component\Console\Command\Command */
+	protected $command;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$manager = $this->manager = $this->getMockBuilder('OCP\Encryption\IManager')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+		$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+
+		/** @var \OCP\Encryption\IManager $manager */
+		$this->command = new SetDefaultModule($manager);
+	}
+
+
+	public function dataSetDefaultModule() {
+		return [
+			['ID0', 'ID0', null, null, 'already'],
+			['ID0', 'ID1', 'ID1', true, 'info'],
+			['ID0', 'ID1', 'ID1', false, 'error'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetDefaultModule
+	 *
+	 * @param string $oldModule
+	 * @param string $newModule
+	 * @param string $updateModule
+	 * @param bool $updateSuccess
+	 * @param string $expectedString
+	 */
+	public function testSetDefaultModule($oldModule, $newModule, $updateModule, $updateSuccess, $expectedString) {
+		$this->consoleInput->expects($this->once())
+			->method('getArgument')
+			->with('module')
+			->willReturn($newModule);
+
+		$this->manager->expects($this->once())
+			->method('getDefaultEncryptionModuleId')
+			->willReturn($oldModule);
+		if ($updateModule) {
+			$this->manager->expects($this->once())
+				->method('setDefaultEncryptionModule')
+				->with($updateModule)
+				->willReturn($updateSuccess);
+		}
+
+		$this->consoleOutput->expects($this->once())
+			->method('writeln')
+			->with($this->stringContains($expectedString));
+
+		\Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list