From 2f34df4982515bb859c8d985cb638782892629b6 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Tue, 21 Aug 2018 09:07:10 +0200 Subject: Fix integration test execution on Dron Apparently the Nextcloud server ignores tests that have `Integration` in their fully-qualified class name, hence the backup codes integration tests were removed. This moves them up one directory (out of `Integration`) to fix that. Real unit tests remain in the `Unit` directory. Signed-off-by: Christoph Wurst --- .../tests/Db/BackupCodeMapperTest.php | 121 +++++++++++++++++++++ .../tests/Integration/Db/BackupCodeMapperTest.php | 121 --------------------- .../Integration/Service/BackupCodeStorageTest.php | 89 --------------- .../tests/Service/BackupCodeStorageTest.php | 89 +++++++++++++++ 4 files changed, 210 insertions(+), 210 deletions(-) create mode 100644 apps/twofactor_backupcodes/tests/Db/BackupCodeMapperTest.php delete mode 100644 apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php delete mode 100644 apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php create mode 100644 apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php (limited to 'apps') diff --git a/apps/twofactor_backupcodes/tests/Db/BackupCodeMapperTest.php b/apps/twofactor_backupcodes/tests/Db/BackupCodeMapperTest.php new file mode 100644 index 00000000000..76cdac3c21a --- /dev/null +++ b/apps/twofactor_backupcodes/tests/Db/BackupCodeMapperTest.php @@ -0,0 +1,121 @@ + + * + * @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\TwoFactorBackupCodes\Tests\Db; + +use OCA\TwoFactorBackupCodes\Db\BackupCode; +use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper; +use OCP\IDBConnection; +use OCP\IUser; +use Test\TestCase; + +/** + * @group DB + */ +class BackupCodeMapperTest extends TestCase { + + /** @var IDBConnection */ + private $db; + + /** @var BackupCodeMapper */ + private $mapper; + + /** @var string */ + private $testUID = 'test123456'; + + private function resetDB() { + $qb = $this->db->getQueryBuilder(); + $qb->delete($this->mapper->getTableName()) + ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($this->testUID))); + $qb->execute(); + } + + protected function setUp() { + parent::setUp(); + + $this->db = \OC::$server->getDatabaseConnection(); + $this->mapper = \OC::$server->query(BackupCodeMapper::class); + + $this->resetDB(); + } + + protected function tearDown() { + parent::tearDown(); + + $this->resetDB(); + } + + public function testGetBackupCodes() { + $code1 = new BackupCode(); + $code1->setUserId($this->testUID); + $code1->setCode('1|$2y$10$Fyo.DkMtkaHapVvRVbQBeeIdi5x/6nmPnxiBzD0GDKa08NMus5xze'); + $code1->setUsed(1); + + $code2 = new BackupCode(); + $code2->setUserId($this->testUID); + $code2->setCode('1|$2y$10$nj3sZaCqGN8t6.SsnNADt.eX34UCkdX6FPx.r.rIwE6Jj3vi5wyt2'); + $code2->setUsed(0); + + $this->mapper->insert($code1); + $this->mapper->insert($code2); + + $user = $this->getMockBuilder(IUser::class)->getMock(); + $user->expects($this->once()) + ->method('getUID') + ->will($this->returnValue($this->testUID)); + + $dbCodes = $this->mapper->getBackupCodes($user); + + $this->assertCount(2, $dbCodes); + $this->assertInstanceOf(BackupCode::class, $dbCodes[0]); + $this->assertInstanceOf(BackupCode::class, $dbCodes[1]); + } + + public function testDeleteCodes() { + $code = new BackupCode(); + $code->setUserId($this->testUID); + $code->setCode('1|$2y$10$CagG8pEhZL.xDirtCCP/KuuWtnsAasgq60zY9rU46dBK4w8yW0Z/y'); + $code->setUsed(1); + $user = $this->getMockBuilder(IUser::class)->getMock(); + $user->expects($this->any()) + ->method('getUID') + ->will($this->returnValue($this->testUID)); + + $this->mapper->insert($code); + + $this->assertCount(1, $this->mapper->getBackupCodes($user)); + + $this->mapper->deleteCodes($user); + + $this->assertCount(0, $this->mapper->getBackupCodes($user)); + } + + public function testInsertArgonEncryptedCodes() { + $code = new BackupCode(); + $code->setUserId($this->testUID); + $code->setCode('2|$argon2i$v=19$m=1024,t=2,p=2$MjJWUjRFWndtMm5BWGxOag$BusVxLeFyiLLWtaVvX/JRFBiPdZcjRrzpQ/rAhn6vqY'); + $code->setUsed(1); + + $this->mapper->insert($code); + } + +} diff --git a/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php b/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php deleted file mode 100644 index 6640a1c0ebf..00000000000 --- a/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php +++ /dev/null @@ -1,121 +0,0 @@ - - * - * @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\TwoFactorBackupCodes\Tests\Integration\Db; - -use OCA\TwoFactorBackupCodes\Db\BackupCode; -use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper; -use OCP\IDBConnection; -use OCP\IUser; -use Test\TestCase; - -/** - * @group DB - */ -class BackupCodeMapperTest extends TestCase { - - /** @var IDBConnection */ - private $db; - - /** @var BackupCodeMapper */ - private $mapper; - - /** @var string */ - private $testUID = 'test123456'; - - private function resetDB() { - $qb = $this->db->getQueryBuilder(); - $qb->delete($this->mapper->getTableName()) - ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($this->testUID))); - $qb->execute(); - } - - protected function setUp() { - parent::setUp(); - - $this->db = \OC::$server->getDatabaseConnection(); - $this->mapper = \OC::$server->query(BackupCodeMapper::class); - - $this->resetDB(); - } - - protected function tearDown() { - parent::tearDown(); - - $this->resetDB(); - } - - public function testGetBackupCodes() { - $code1 = new BackupCode(); - $code1->setUserId($this->testUID); - $code1->setCode('1|$2y$10$Fyo.DkMtkaHapVvRVbQBeeIdi5x/6nmPnxiBzD0GDKa08NMus5xze'); - $code1->setUsed(1); - - $code2 = new BackupCode(); - $code2->setUserId($this->testUID); - $code2->setCode('1|$2y$10$nj3sZaCqGN8t6.SsnNADt.eX34UCkdX6FPx.r.rIwE6Jj3vi5wyt2'); - $code2->setUsed(0); - - $this->mapper->insert($code1); - $this->mapper->insert($code2); - - $user = $this->getMockBuilder(IUser::class)->getMock(); - $user->expects($this->once()) - ->method('getUID') - ->will($this->returnValue($this->testUID)); - - $dbCodes = $this->mapper->getBackupCodes($user); - - $this->assertCount(2, $dbCodes); - $this->assertInstanceOf(BackupCode::class, $dbCodes[0]); - $this->assertInstanceOf(BackupCode::class, $dbCodes[1]); - } - - public function testDeleteCodes() { - $code = new BackupCode(); - $code->setUserId($this->testUID); - $code->setCode('1|$2y$10$CagG8pEhZL.xDirtCCP/KuuWtnsAasgq60zY9rU46dBK4w8yW0Z/y'); - $code->setUsed(1); - $user = $this->getMockBuilder(IUser::class)->getMock(); - $user->expects($this->any()) - ->method('getUID') - ->will($this->returnValue($this->testUID)); - - $this->mapper->insert($code); - - $this->assertCount(1, $this->mapper->getBackupCodes($user)); - - $this->mapper->deleteCodes($user); - - $this->assertCount(0, $this->mapper->getBackupCodes($user)); - } - - public function testInsertArgonEncryptedCodes() { - $code = new BackupCode(); - $code->setUserId($this->testUID); - $code->setCode('2|$argon2i$v=19$m=1024,t=2,p=2$MjJWUjRFWndtMm5BWGxOag$BusVxLeFyiLLWtaVvX/JRFBiPdZcjRrzpQ/rAhn6vqY'); - $code->setUsed(1); - - $this->mapper->insert($code); - } - -} diff --git a/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php b/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php deleted file mode 100644 index 6d28b4fa758..00000000000 --- a/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php +++ /dev/null @@ -1,89 +0,0 @@ - - * - * @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\TwoFactorBackupCodes\Tests\Integration\Service; - -use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage; -use Test\TestCase; - -/** - * @group DB - */ -class BackupCodeStorageTest extends TestCase { - - /** @var BackupCodeStorage */ - private $storage; - - /** @var string */ - private $testUID = 'test123456789'; - - protected function setUp() { - parent::setUp(); - - $this->storage = \OC::$server->query(BackupCodeStorage::class); - } - - public function testSimpleWorkFlow() { - $user = $this->getMockBuilder(\OCP\IUser::class)->getMock(); - $user->expects($this->any()) - ->method('getUID') - ->will($this->returnValue($this->testUID)); - - // Create codes - $codes = $this->storage->createCodes($user, 5); - $this->assertCount(5, $codes); - $this->assertTrue($this->storage->hasBackupCodes($user)); - $initialState = [ - 'enabled' => true, - 'total' => 5, - 'used' => 0, - ]; - $this->assertEquals($initialState, $this->storage->getBackupCodesState($user)); - - // Use codes - $code = $codes[2]; - $this->assertTrue($this->storage->validateCode($user, $code)); - // Code must not be used twice - $this->assertFalse($this->storage->validateCode($user, $code)); - // Invalid codes are invalid - $this->assertFalse($this->storage->validateCode($user, 'I DO NOT EXIST')); - $stateAfter = [ - 'enabled' => true, - 'total' => 5, - 'used' => 1, - ]; - $this->assertEquals($stateAfter, $this->storage->getBackupCodesState($user)); - - // Deplete codes - $this->assertTrue($this->storage->validateCode($user, $codes[0])); - $this->assertTrue($this->storage->validateCode($user, $codes[1])); - $this->assertTrue($this->storage->validateCode($user, $codes[3])); - $this->assertTrue($this->storage->validateCode($user, $codes[4])); - $stateAllUsed = [ - 'enabled' => true, - 'total' => 5, - 'used' => 5, - ]; - $this->assertEquals($stateAllUsed, $this->storage->getBackupCodesState($user)); - } - -} diff --git a/apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php b/apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php new file mode 100644 index 00000000000..7d47b4ea721 --- /dev/null +++ b/apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php @@ -0,0 +1,89 @@ + + * + * @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\TwoFactorBackupCodes\Tests\Service; + +use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage; +use Test\TestCase; + +/** + * @group DB + */ +class BackupCodeStorageTest extends TestCase { + + /** @var BackupCodeStorage */ + private $storage; + + /** @var string */ + private $testUID = 'test123456789'; + + protected function setUp() { + parent::setUp(); + + $this->storage = \OC::$server->query(BackupCodeStorage::class); + } + + public function testSimpleWorkFlow() { + $user = $this->getMockBuilder(\OCP\IUser::class)->getMock(); + $user->expects($this->any()) + ->method('getUID') + ->will($this->returnValue($this->testUID)); + + // Create codes + $codes = $this->storage->createCodes($user, 5); + $this->assertCount(5, $codes); + $this->assertTrue($this->storage->hasBackupCodes($user)); + $initialState = [ + 'enabled' => true, + 'total' => 5, + 'used' => 0, + ]; + $this->assertEquals($initialState, $this->storage->getBackupCodesState($user)); + + // Use codes + $code = $codes[2]; + $this->assertTrue($this->storage->validateCode($user, $code)); + // Code must not be used twice + $this->assertFalse($this->storage->validateCode($user, $code)); + // Invalid codes are invalid + $this->assertFalse($this->storage->validateCode($user, 'I DO NOT EXIST')); + $stateAfter = [ + 'enabled' => true, + 'total' => 5, + 'used' => 1, + ]; + $this->assertEquals($stateAfter, $this->storage->getBackupCodesState($user)); + + // Deplete codes + $this->assertTrue($this->storage->validateCode($user, $codes[0])); + $this->assertTrue($this->storage->validateCode($user, $codes[1])); + $this->assertTrue($this->storage->validateCode($user, $codes[3])); + $this->assertTrue($this->storage->validateCode($user, $codes[4])); + $stateAllUsed = [ + 'enabled' => true, + 'total' => 5, + 'used' => 5, + ]; + $this->assertEquals($stateAllUsed, $this->storage->getBackupCodesState($user)); + } + +} -- cgit v1.2.3