From 1a20af253bc90de35a1bf3b65adb33ab44d17c1d Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 7 Dec 2015 15:28:06 +0100 Subject: Adding tests and adjust PHPDoc --- apps/federation/tests/dav/fedauthtest.php | 52 +++++++++++++++++++++++++++++ apps/federation/tests/lib/dbhandlertest.php | 26 ++++++++++++++- 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 apps/federation/tests/dav/fedauthtest.php (limited to 'apps/federation/tests') diff --git a/apps/federation/tests/dav/fedauthtest.php b/apps/federation/tests/dav/fedauthtest.php new file mode 100644 index 00000000000..845cfc622d2 --- /dev/null +++ b/apps/federation/tests/dav/fedauthtest.php @@ -0,0 +1,52 @@ + + * + * @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 + * + */ + + +namespace OCA\Federation\Tests\DAV; + +use OCA\Federation\DAV\FedAuth; +use OCA\Federation\DbHandler; +use Test\TestCase; + +class FedAuthTest extends TestCase { + + /** + * @dataProvider providesUser + * + * @param array $expected + * @param string $user + * @param string $password + */ + public function testFedAuth($expected, $user, $password) { + /** @var DbHandler | \PHPUnit_Framework_MockObject_MockObject $db */ + $db = $this->getMockBuilder('OCA\Federation\DbHandler')->disableOriginalConstructor()->getMock(); + $db->method('auth')->willReturn(true); + $auth = new FedAuth($db); + $result = $this->invokePrivate($auth, 'validateUserPass', [$user, $password]); + $this->assertEquals($expected, $result); + } + + public function providesUser() { + return [ + [true, 'system', '123456'] + ]; + } +} diff --git a/apps/federation/tests/lib/dbhandlertest.php b/apps/federation/tests/lib/dbhandlertest.php index 123eaaee450..65126e39f72 100644 --- a/apps/federation/tests/lib/dbhandlertest.php +++ b/apps/federation/tests/lib/dbhandlertest.php @@ -26,6 +26,7 @@ namespace OCA\Federation\Tests\lib; use OCA\Federation\DbHandler; use OCA\Federation\TrustedServers; use OCP\IDBConnection; +use OCP\IL10N; use Test\TestCase; /** @@ -36,7 +37,7 @@ class DbHandlerTest extends TestCase { /** @var DbHandler */ private $dbHandler; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */ private $il10n; /** @var IDBConnection */ @@ -209,6 +210,11 @@ class DbHandlerTest extends TestCase { $this->assertSame(TrustedServers::STATUS_OK, $this->dbHandler->getServerStatus('https://server1') ); + + // test sync token + $this->dbHandler->setServerStatus('http://server1', TrustedServers::STATUS_OK, 'token1234567890'); + $servers = $this->dbHandler->getAllServer(); + $this->assertSame('token1234567890', $servers[0]['sync_token']); } /** @@ -256,4 +262,22 @@ class DbHandlerTest extends TestCase { ]; } + /** + * @dataProvider providesAuth + */ + public function testAuth($expectedResult, $user, $password) { + if ($expectedResult) { + $this->dbHandler->addServer('url1'); + $this->dbHandler->addSharedSecret('url1', $password); + } + $result = $this->dbHandler->auth($user, $password); + $this->assertEquals($expectedResult, $result); + } + + public function providesAuth() { + return [ + [false, 'foo', ''], + [true, 'system', '123456789'], + ]; + } } -- cgit v1.2.3