From f9fc2546724e94d0cf1eb06baa784f9e79816617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu> Date: Wed, 25 Nov 2015 16:58:54 +0100 Subject: [PATCH] Add DB group to some files_external tests Adding group Db to federation tests and ldap tests Add group DB to Test_UrlGenerator Adding group DB to trashbin and versions tests Adding group DB to Test_Util_CheckServer for pg --- .../tests/backgroundjob/getsharedsecrettest.php | 7 +++++++ apps/files_external/tests/amazons3migration.php | 7 +++++++ apps/files_external/tests/etagpropagator.php | 7 +++++++ apps/files_external/tests/owncloudfunctions.php | 7 +++++++ apps/files_trashbin/tests/command/expiretest.php | 7 +++++++ apps/files_versions/tests/command/cleanuptest.php | 7 +++++++ apps/files_versions/tests/command/expiretest.php | 7 +++++++ apps/user_ldap/tests/access.php | 7 +++++++ apps/user_ldap/tests/connection.php | 9 ++++++++- apps/user_ldap/tests/group_ldap.php | 7 +++++++ apps/user_ldap/tests/mapping/groupmapping.php | 7 +++++++ apps/user_ldap/tests/mapping/usermapping.php | 7 +++++++ apps/user_ldap/tests/user/manager.php | 7 +++++++ apps/user_ldap/tests/user/user.php | 7 +++++++ apps/user_ldap/tests/user_ldap.php | 7 +++++++ apps/user_ldap/tests/wizard.php | 7 +++++++ lib/private/files/storage/dav.php | 1 + lib/private/urlgenerator.php | 1 + tests/lib/{urlgenerator.php => urlGenerator.php} | 7 ++++++- tests/lib/utilcheckserver.php | 2 ++ 20 files changed, 123 insertions(+), 2 deletions(-) rename tests/lib/{urlgenerator.php => urlGenerator.php} (97%) diff --git a/apps/federation/tests/backgroundjob/getsharedsecrettest.php b/apps/federation/tests/backgroundjob/getsharedsecrettest.php index 953af5ff3e..cb3a294713 100644 --- a/apps/federation/tests/backgroundjob/getsharedsecrettest.php +++ b/apps/federation/tests/backgroundjob/getsharedsecrettest.php @@ -34,6 +34,13 @@ use OCP\Http\Client\IResponse; use OCP\ILogger; use OCP\IURLGenerator; +/** + * Class GetSharedSecretTest + * + * @group DB + * + * @package OCA\Federation\Tests\BackgroundJob + */ class GetSharedSecretTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject | IClient */ diff --git a/apps/files_external/tests/amazons3migration.php b/apps/files_external/tests/amazons3migration.php index 3eba5bca64..33fb6119a9 100644 --- a/apps/files_external/tests/amazons3migration.php +++ b/apps/files_external/tests/amazons3migration.php @@ -25,6 +25,13 @@ namespace Test\Files\Storage; +/** + * Class AmazonS3Migration + * + * @group DB + * + * @package Test\Files\Storage + */ class AmazonS3Migration extends \Test\TestCase { /** diff --git a/apps/files_external/tests/etagpropagator.php b/apps/files_external/tests/etagpropagator.php index d45982cb40..ff3c63add2 100644 --- a/apps/files_external/tests/etagpropagator.php +++ b/apps/files_external/tests/etagpropagator.php @@ -26,6 +26,13 @@ namespace Tests\Files_External; use OC\Files\Filesystem; use OC\User\User; +/** + * Class EtagPropagator + * + * @group DB + * + * @package Tests\Files_External + */ class EtagPropagator extends \Test\TestCase { protected function getUser() { return new User($this->getUniqueID(), null); diff --git a/apps/files_external/tests/owncloudfunctions.php b/apps/files_external/tests/owncloudfunctions.php index 4cfe83db95..887dd91539 100644 --- a/apps/files_external/tests/owncloudfunctions.php +++ b/apps/files_external/tests/owncloudfunctions.php @@ -24,6 +24,13 @@ namespace Test\Files\Storage; +/** + * Class OwnCloudFunctions + * + * @group DB + * + * @package Test\Files\Storage + */ class OwnCloudFunctions extends \Test\TestCase { function configUrlProvider() { diff --git a/apps/files_trashbin/tests/command/expiretest.php b/apps/files_trashbin/tests/command/expiretest.php index 0d457db280..463fca6080 100644 --- a/apps/files_trashbin/tests/command/expiretest.php +++ b/apps/files_trashbin/tests/command/expiretest.php @@ -24,6 +24,13 @@ namespace OCA\Files_Trashbin\Tests\Command; use OCA\Files_Trashbin\Command\Expire; use Test\TestCase; +/** + * Class ExpireTest + * + * @group DB + * + * @package OCA\Files_Trashbin\Tests\Command + */ class ExpireTest extends TestCase { public function testExpireNonExistingUser() { $command = new Expire('test'); diff --git a/apps/files_versions/tests/command/cleanuptest.php b/apps/files_versions/tests/command/cleanuptest.php index bfde25d75c..141213774c 100644 --- a/apps/files_versions/tests/command/cleanuptest.php +++ b/apps/files_versions/tests/command/cleanuptest.php @@ -28,6 +28,13 @@ use Test\TestCase; use OC\User\Manager; use OCP\Files\IRootFolder; +/** + * Class CleanupTest + * + * @group DB + * + * @package OCA\Files_Versions\Tests\Command + */ class CleanupTest extends TestCase { /** @var CleanUp */ diff --git a/apps/files_versions/tests/command/expiretest.php b/apps/files_versions/tests/command/expiretest.php index eccc1f4c2a..5048ab1ef3 100644 --- a/apps/files_versions/tests/command/expiretest.php +++ b/apps/files_versions/tests/command/expiretest.php @@ -25,6 +25,13 @@ namespace OCA\Files_Versions\Tests\Command; use OCA\Files_Versions\Command\Expire; use Test\TestCase; +/** + * Class ExpireTest + * + * @group DB + * + * @package OCA\Files_Versions\Tests\Command + */ class ExpireTest extends TestCase { public function testExpireNonExistingUser() { $command = new Expire($this->getUniqueID('test'), ''); diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php index 25e871d9b3..ef31a1037d 100644 --- a/apps/user_ldap/tests/access.php +++ b/apps/user_ldap/tests/access.php @@ -28,6 +28,13 @@ use \OCA\user_ldap\lib\Access; use \OCA\user_ldap\lib\Connection; use \OCA\user_ldap\lib\ILDAPWrapper; +/** + * Class Test_Access + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_Access extends \Test\TestCase { private function getConnectorAndLdapMock() { static $conMethods; diff --git a/apps/user_ldap/tests/connection.php b/apps/user_ldap/tests/connection.php index b0b4b78ce4..10a299a61b 100644 --- a/apps/user_ldap/tests/connection.php +++ b/apps/user_ldap/tests/connection.php @@ -23,6 +23,13 @@ namespace OCA\user_ldap\tests; +/** + * Class Test_Connection + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_Connection extends \Test\TestCase { public function testOriginalAgentUnchangedOnClone() { @@ -52,4 +59,4 @@ class Test_Connection extends \Test\TestCase { $this->assertSame($agentPawd, $agent['ldapAgentPassword']); } -} \ No newline at end of file +} diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php index 6a6d5bc7ca..5362b97f21 100644 --- a/apps/user_ldap/tests/group_ldap.php +++ b/apps/user_ldap/tests/group_ldap.php @@ -30,6 +30,13 @@ use \OCA\user_ldap\lib\Access; use \OCA\user_ldap\lib\Connection; use \OCA\user_ldap\lib\ILDAPWrapper; +/** + * Class Test_Group_Ldap + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_Group_Ldap extends \Test\TestCase { private function getAccessMock() { static $conMethods; diff --git a/apps/user_ldap/tests/mapping/groupmapping.php b/apps/user_ldap/tests/mapping/groupmapping.php index e8fe655630..f9136cf529 100644 --- a/apps/user_ldap/tests/mapping/groupmapping.php +++ b/apps/user_ldap/tests/mapping/groupmapping.php @@ -24,6 +24,13 @@ namespace OCA\user_ldap\tests\mapping; use OCA\User_LDAP\Mapping\GroupMapping; +/** + * Class Test_GroupMapping + * + * @group DB + * + * @package OCA\user_ldap\tests\mapping + */ class Test_GroupMapping extends AbstractMappingTest { public function getMapper(\OCP\IDBConnection $dbMock) { return new GroupMapping($dbMock); diff --git a/apps/user_ldap/tests/mapping/usermapping.php b/apps/user_ldap/tests/mapping/usermapping.php index fa9311b405..e84f502023 100644 --- a/apps/user_ldap/tests/mapping/usermapping.php +++ b/apps/user_ldap/tests/mapping/usermapping.php @@ -24,6 +24,13 @@ namespace OCA\user_ldap\tests\mapping; use OCA\User_LDAP\Mapping\UserMapping; +/** + * Class Test_UserMapping + * + * @group DB + * + * @package OCA\user_ldap\tests\mapping + */ class Test_UserMapping extends AbstractMappingTest { public function getMapper(\OCP\IDBConnection $dbMock) { return new UserMapping($dbMock); diff --git a/apps/user_ldap/tests/user/manager.php b/apps/user_ldap/tests/user/manager.php index 98e48638d8..d8602978a9 100644 --- a/apps/user_ldap/tests/user/manager.php +++ b/apps/user_ldap/tests/user/manager.php @@ -26,6 +26,13 @@ namespace OCA\user_ldap\tests; use OCA\user_ldap\lib\user\Manager; +/** + * Class Test_User_Manager + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_User_Manager extends \Test\TestCase { private function getTestInstances() { diff --git a/apps/user_ldap/tests/user/user.php b/apps/user_ldap/tests/user/user.php index 19581d835d..a5bb459d6f 100644 --- a/apps/user_ldap/tests/user/user.php +++ b/apps/user_ldap/tests/user/user.php @@ -25,6 +25,13 @@ namespace OCA\user_ldap\tests; use OCA\user_ldap\lib\user\User; +/** + * Class Test_User_User + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_User_User extends \Test\TestCase { private function getTestInstances() { diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php index 0f70c43fc1..7593371d85 100644 --- a/apps/user_ldap/tests/user_ldap.php +++ b/apps/user_ldap/tests/user_ldap.php @@ -31,6 +31,13 @@ use \OCA\user_ldap\lib\Access; use \OCA\user_ldap\lib\Connection; use \OCA\user_ldap\lib\ILDAPWrapper; +/** + * Class Test_User_Ldap_Direct + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_User_Ldap_Direct extends \Test\TestCase { protected $backend; protected $access; diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php index 7b04618783..c29361096a 100644 --- a/apps/user_ldap/tests/wizard.php +++ b/apps/user_ldap/tests/wizard.php @@ -31,6 +31,13 @@ use \OCA\user_ldap\lib\Wizard; // use \OCA\user_ldap\lib\Configuration; // use \OCA\user_ldap\lib\ILDAPWrapper; +/** + * Class Test_Wizard + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_Wizard extends \Test\TestCase { protected function setUp() { parent::setUp(); diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php index 9147f57246..dda163e41a 100644 --- a/lib/private/files/storage/dav.php +++ b/lib/private/files/storage/dav.php @@ -105,6 +105,7 @@ class DAV extends Common { $this->secure = false; } if ($this->secure === true) { + // inject mock for testing $certPath = \OC_User::getHome(\OC_User::getUser()) . '/files_external/rootcerts.crt'; if (file_exists($certPath)) { $this->certPath = $certPath; diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index 104cf7df59..428a222f9c 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -62,6 +62,7 @@ class URLGenerator implements IURLGenerator { * Returns a url to the given route. */ public function linkToRoute($route, $parameters = array()) { + // TODO: mock router $urlLinkTo = \OC::$server->getRouter()->generate($route, $parameters); return $urlLinkTo; } diff --git a/tests/lib/urlgenerator.php b/tests/lib/urlGenerator.php similarity index 97% rename from tests/lib/urlgenerator.php rename to tests/lib/urlGenerator.php index a5ab483109..07103225ba 100644 --- a/tests/lib/urlgenerator.php +++ b/tests/lib/urlGenerator.php @@ -6,7 +6,12 @@ * See the COPYING-README file. */ -class Test_Urlgenerator extends \Test\TestCase { +/** + * Class Test_UrlGenerator + * + * @group DB + */ +class Test_UrlGenerator extends \Test\TestCase { /** * @small diff --git a/tests/lib/utilcheckserver.php b/tests/lib/utilcheckserver.php index bb9b7a2445..a5ec529ff8 100644 --- a/tests/lib/utilcheckserver.php +++ b/tests/lib/utilcheckserver.php @@ -8,6 +8,8 @@ /** * Tests for server check functions + * + * @group DB */ class Test_Util_CheckServer extends \Test\TestCase { -- GitLab