Merge pull request #3081 from nextcloud/2fa-backup-codes-test-coverage

2fa backup codes test coverage

7 files changed, 184 insertions, 17 deletions

diff --git a/apps/twofactor_backupcodes/appinfo/app.php b/apps/twofactor_backupcodes/appinfo/app.php
index 31f9b6b8eae..0cb10531360 100644
--- a/apps/twofactor_backupcodes/appinfo/app.php
+++ b/apps/twofactor_backupcodes/appinfo/app.php
@@ -19,4 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
+// @codeCoverageIgnoreStart
 OC_App::registerPersonal('twofactor_backupcodes', 'settings/personal');
+// @codeCoverageIgnoreEnd
diff --git a/apps/twofactor_backupcodes/appinfo/routes.php b/apps/twofactor_backupcodes/appinfo/routes.php
index f2af12e9b45..0119bfd0b08 100644
--- a/apps/twofactor_backupcodes/appinfo/routes.php
+++ b/apps/twofactor_backupcodes/appinfo/routes.php
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+// @codeCoverageIgnoreStart
 return [
 	'routes' => [
 		[
@@ -33,3 +34,4 @@ return [
 		],
 	]
 ];
+// @codeCoverageIgnoreEnd
diff --git a/apps/twofactor_backupcodes/lib/Activity/Provider.php b/apps/twofactor_backupcodes/lib/Activity/Provider.php
index cfb16c9f8d3..9c7aaeae630 100644
--- a/apps/twofactor_backupcodes/lib/Activity/Provider.php
+++ b/apps/twofactor_backupcodes/lib/Activity/Provider.php
@@ -40,6 +40,11 @@ class Provider implements IProvider {
 	/** @var ILogger */
 	private $logger;
 
+	/**
+	 * @param L10nFactory $l10n
+	 * @param IURLGenerator $urlGenerator
+	 * @param ILogger $logger
+	 */
 	public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, ILogger $logger) {
 		$this->logger = $logger;
 		$this->urlGenerator = $urlGenerator;
diff --git a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
index f64e2e9e60b..85cc174fb6a 100644
--- a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
+++ b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
@@ -22,7 +22,6 @@
 namespace OCA\TwoFactorBackupCodes\Db;
 
 use OCP\AppFramework\Db\Mapper;
-use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUser;
 
diff --git a/apps/twofactor_backupcodes/settings/personal.php b/apps/twofactor_backupcodes/settings/personal.php
index 037516e39a3..0a018c0ff28 100644
--- a/apps/twofactor_backupcodes/settings/personal.php
+++ b/apps/twofactor_backupcodes/settings/personal.php
@@ -1,5 +1,6 @@
 <?php
-
+// @codeCoverageIgnoreStart
 $tmpl = new \OCP\Template('twofactor_backupcodes', 'personal');
 
 return $tmpl->fetchPage();
+// @codeCoverageIgnoreEnd
diff --git a/apps/twofactor_backupcodes/tests/Unit/Activity/GenericProviderTest.php b/apps/twofactor_backupcodes/tests/Unit/Activity/GenericProviderTest.php
new file mode 100644
index 00000000000..242c4ab4e8d
--- /dev/null
+++ b/apps/twofactor_backupcodes/tests/Unit/Activity/GenericProviderTest.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @copyright Copyright (c) 2016 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * Two-factor backup codes
+ *
+ * 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\TwoFactorBackupCodes\Test\Unit\Activity;
+
+use InvalidArgumentException;
+use OCA\TwoFactorBackupCodes\Activity\GenericProvider;
+use OCP\Activity\IEvent;
+use OCP\IL10N;
+use OCP\ILogger;
+use OCP\IURLGenerator;
+use OCP\L10N\IFactory;
+use PHPUnit_Framework_MockObject_MockObject;
+use Test\TestCase;
+
+class GenericProviderTest extends TestCase {
+
+	/** @var IL10N|PHPUnit_Framework_MockObject_MockObject */
+	private $l10n;
+
+	/** @var IURLGenerator|PHPUnit_Framework_MockObject_MockObject */
+	private $urlGenerator;
+
+	/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
+	private $logger;
+
+	/** @var GenericProvider */
+	private $provider;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->l10n = $this->createMock(IFactory::class);
+		$this->urlGenerator = $this->createMock(IURLGenerator::class);
+		$this->logger = $this->createMock(ILogger::class);
+
+		$this->provider = new GenericProvider($this->l10n, $this->urlGenerator, $this->logger);
+	}
+
+	public function testParseUnrelated() {
+		$lang = 'ru';
+		$event = $this->createMock(IEvent::class);
+		$event->expects($this->once())
+			->method('getType')
+			->willReturn('comments');
+		$this->setExpectedException(InvalidArgumentException::class);
+
+		$this->provider->parse($lang, $event);
+	}
+
+	public function subjectData() {
+		return [
+			['twofactor_success'],
+			['twofactor_failed'],
+		];
+	}
+
+	/**
+	 * @dataProvider subjectData
+	 */
+	public function testParse($subject) {
+		$lang = 'ru';
+		$event = $this->createMock(IEvent::class);
+		$l = $this->createMock(IL10N::class);
+
+		$event->expects($this->once())
+			->method('getType')
+			->willReturn('twofactor');
+		$this->l10n->expects($this->once())
+			->method('get')
+			->with('core', $lang)
+			->willReturn($l);
+		$this->urlGenerator->expects($this->once())
+			->method('imagePath')
+			->with('core', 'actions/password.svg')
+			->willReturn('path/to/image');
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with('path/to/image')
+			->willReturn('absolute/path/to/image');
+		$event->expects($this->once())
+			->method('setIcon')
+			->with('absolute/path/to/image');
+		$event->expects($this->once())
+			->method('getSubject')
+			->willReturn($subject);
+		$event->expects($this->once())
+			->method('setParsedSubject');
+
+		$this->provider->parse($lang, $event);
+	}
+
+	public function testParseInvalidSubject() {
+		$lang = 'ru';
+		$l = $this->createMock(IL10N::class);
+		$event = $this->createMock(IEvent::class);
+
+		$event->expects($this->once())
+			->method('getType')
+			->willReturn('twofactor');
+		$this->l10n->expects($this->once())
+			->method('get')
+			->with('core', $lang)
+			->willReturn($l);
+		$event->expects($this->once())
+			->method('getSubject')
+			->willReturn('unrelated');
+
+		$this->expectException(InvalidArgumentException::class);
+		$this->provider->parse($lang, $event);
+	}
+
+}
diff --git a/apps/twofactor_backupcodes/tests/Unit/Activity/ProviderTest.php b/apps/twofactor_backupcodes/tests/Unit/Activity/ProviderTest.php
index 36e85ec1872..e1a13c89c10 100644
--- a/apps/twofactor_backupcodes/tests/Unit/Activity/ProviderTest.php
+++ b/apps/twofactor_backupcodes/tests/Unit/Activity/ProviderTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @copyright Copyright (c) 2016 Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @copyright Copyright (c) 2017 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
  * Two-factor backup codes
  *
@@ -23,21 +23,27 @@
 namespace OCA\TwoFactorBackupCodes\Test\Unit\Activity;
 
 use InvalidArgumentException;
-use OCA\TwoFactorBackupCodes\Activity\GenericProvider;
+use OCA\TwoFactorBackupCodes\Activity\Provider;
 use OCP\Activity\IEvent;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\IURLGenerator;
 use OCP\L10N\IFactory;
+use PHPUnit_Framework_MockObject_MockObject;
 use Test\TestCase;
 
 class ProviderTest extends TestCase {
 
+	/** @var IL10N|PHPUnit_Framework_MockObject_MockObject */
 	private $l10n;
+
+	/** @var IURLGenerator|PHPUnit_Framework_MockObject_MockObject */
 	private $urlGenerator;
+
+	/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
 	private $logger;
 
-	/** @var GenericProvider */
+	/** @var Provider */
 	private $provider;
 
 	protected function setUp() {
@@ -47,15 +53,15 @@ class ProviderTest extends TestCase {
 		$this->urlGenerator = $this->createMock(IURLGenerator::class);
 		$this->logger = $this->createMock(ILogger::class);
 
-		$this->provider = new GenericProvider($this->l10n, $this->urlGenerator, $this->logger);
+		$this->provider = new Provider($this->l10n, $this->urlGenerator, $this->logger);
 	}
 
 	public function testParseUnrelated() {
 		$lang = 'ru';
 		$event = $this->createMock(IEvent::class);
 		$event->expects($this->once())
-			->method('getType')
-			->will($this->returnValue('comments'));
+			->method('getApp')
+			->willReturn('comments');
 		$this->setExpectedException(InvalidArgumentException::class);
 
 		$this->provider->parse($lang, $event);
@@ -63,8 +69,7 @@ class ProviderTest extends TestCase {
 
 	public function subjectData() {
 		return [
-				['twofactor_success'],
-				['twofactor_failed'],
+			['codes_generated'],
 		];
 	}
 
@@ -77,30 +82,50 @@ class ProviderTest extends TestCase {
 		$l = $this->createMock(IL10N::class);
 
 		$event->expects($this->once())
-			->method('getType')
-			->will($this->returnValue('twofactor'));
+			->method('getApp')
+			->willReturn('twofactor_backupcodes');
 		$this->l10n->expects($this->once())
 			->method('get')
-			->with('core', $lang)
-			->will($this->returnValue($l));
+			->with('twofactor_backupcodes', $lang)
+			->willReturn($l);
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
 			->with('core', 'actions/password.svg')
-			->will($this->returnValue('path/to/image'));
+			->willReturn('path/to/image');
 		$this->urlGenerator->expects($this->once())
 			->method('getAbsoluteURL')
 			->with('path/to/image')
-			->will($this->returnValue('absolute/path/to/image'));
+			->willReturn('absolute/path/to/image');
 		$event->expects($this->once())
 			->method('setIcon')
 			->with('absolute/path/to/image');
 		$event->expects($this->once())
 			->method('getSubject')
-			->will($this->returnValue($subject));
+			->willReturn($subject);
 		$event->expects($this->once())
 			->method('setParsedSubject');
 
 		$this->provider->parse($lang, $event);
 	}
 
+	public function testParseInvalidSubject() {
+		$lang = 'ru';
+		$l = $this->createMock(IL10N::class);
+		$event = $this->createMock(IEvent::class);
+
+		$event->expects($this->once())
+			->method('getApp')
+			->willReturn('twofactor_backupcodes');
+		$this->l10n->expects($this->once())
+			->method('get')
+			->with('twofactor_backupcodes', $lang)
+			->willReturn($l);
+		$event->expects($this->once())
+			->method('getSubject')
+			->willReturn('unrelated');
+
+		$this->expectException(InvalidArgumentException::class);
+		$this->provider->parse($lang, $event);
+	}
+
 }