From 9e76577ead00471d556c4fcf3534fd17c5b21fec Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 25 Jan 2018 13:44:47 +0100 Subject: [PATCH] Add tests Signed-off-by: Roeland Jago Douma --- apps/admin_audit/lib/Actions/Security.php | 4 +- .../tests/Actions/SecurityTest.php | 75 +++++++++++++++++++ tests/enable_all.php | 1 + tests/phpunit-autotest.xml | 1 + 4 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 apps/admin_audit/tests/Actions/SecurityTest.php diff --git a/apps/admin_audit/lib/Actions/Security.php b/apps/admin_audit/lib/Actions/Security.php index 4e631aeddd..b7ef1332f3 100644 --- a/apps/admin_audit/lib/Actions/Security.php +++ b/apps/admin_audit/lib/Actions/Security.php @@ -45,7 +45,7 @@ class Security extends Action { 'Failed two factor attempt by user %s (%s) with provider %s', $params, [ - 'displayname', + 'displayName', 'uid', 'provider', ] @@ -66,7 +66,7 @@ class Security extends Action { 'Successful two factor attempt by user %s (%s) with provider %s', $params, [ - 'displayname', + 'displayName', 'uid', 'provider', ] diff --git a/apps/admin_audit/tests/Actions/SecurityTest.php b/apps/admin_audit/tests/Actions/SecurityTest.php new file mode 100644 index 0000000000..3a3f25933f --- /dev/null +++ b/apps/admin_audit/tests/Actions/SecurityTest.php @@ -0,0 +1,75 @@ + + * + * @author Roeland Jago Douma + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 + * along with this program. If not, see . + * + */ + +namespace OCA\AdminAudit\Tests\Actions; + +use OCA\AdminAudit\Actions\Security; +use OCP\ILogger; +use OCP\IUser; +use Test\TestCase; + +class SecurityTest extends TestCase { + /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + private $logger; + + /** @var Security */ + private $security; + + /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ + private $user; + + public function setUp() { + parent::setUp(); + + $this->logger = $this->createMock(ILogger::class); + $this->security = new Security($this->logger); + + $this->user = $this->createMock(IUser::class); + $this->user->method('getUID')->willReturn('myuid'); + $this->user->method('getDisplayName')->willReturn('mydisplayname'); + } + + public function testTwofactorFailed() { + $this->logger->expects($this->once()) + ->method('info') + ->with( + $this->equalTo('Failed two factor attempt by user mydisplayname (myuid) with provider myprovider'), + ['app' => 'admin_audit'] + ); + + $this->security->twofactorFailed($this->user, ['provider' => 'myprovider']); + } + + public function testTwofactorSuccess() { + $this->logger->expects($this->once()) + ->method('info') + ->with( + $this->equalTo('Successful two factor attempt by user mydisplayname (myuid) with provider myprovider'), + ['app' => 'admin_audit'] + ); + + $this->security->twofactorSuccess($this->user, ['provider' => 'myprovider']); + } + +} diff --git a/tests/enable_all.php b/tests/enable_all.php index 655597be7c..c494f3e0d5 100644 --- a/tests/enable_all.php +++ b/tests/enable_all.php @@ -24,3 +24,4 @@ enableApp('files_versions'); enableApp('provisioning_api'); enableApp('federation'); enableApp('federatedfilesharing'); +enableApp('admin_audit'); diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml index 34166a09e2..5712838f6b 100644 --- a/tests/phpunit-autotest.xml +++ b/tests/phpunit-autotest.xml @@ -21,6 +21,7 @@ .. ../3rdparty + ../apps/admin_audit/tests ../apps/dav/tests ../apps/encryption/tests ../apps/federatedfilesharing/tests