[9.2] Add missing unit tests (#25936)

* Adjust unit test execution after folder rename

* Adjust login controller tests to match current behavior

* Fix broken unit tests

diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php
index c465ee79ed16c8b663b2147edb921d3584ffaae5..f087fec2105107a92a68a7b63321ea095fa3db87 100644 (file)
--- a/tests/Settings/Controller/CheckSetupControllerTest.php
+++ b/tests/Settings/Controller/CheckSetupControllerTest.php
@@ -42,23 +42,23 @@ use OC\IntegrityCheck\Checker;
  * @package Tests\Settings\Controller
  */
 class CheckSetupControllerTest extends TestCase {
-       /** @var CheckSetupController */
+       /** @var CheckSetupController | \PHPUnit_Framework_MockObject_MockObject */
        private $checkSetupController;
-       /** @var IRequest */
+       /** @var IRequest | \PHPUnit_Framework_MockObject_MockObject */
        private $request;
-       /** @var IConfig */
+       /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
        private $config;
-       /** @var IClientService */
+       /** @var IClientService | \PHPUnit_Framework_MockObject_MockObject*/
        private $clientService;
-       /** @var IURLGenerator */
+       /** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */
        private $urlGenerator;
        /** @var OC_Util */
        private $util;
-       /** @var IL10N */
+       /** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */
        private $l10n;
        /** @var ILogger */
        private $logger;
-       /** @var Checker */
+       /** @var Checker | \PHPUnit_Framework_MockObject_MockObject */
        private $checker;
 
        public function setUp() {

diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 3a82a56ebbf01aa2daa5f4c11c6b667fddda1d1c..ba16bbdbaacfab0598c6d59abd63a92575e6437b 100644 (file)
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -10,6 +10,7 @@
                <directory suffix='.php'>lib/</directory>
                <directory suffix='.php'>Settings/</directory>
                <directory suffix='.php'>Core/</directory>
+               <directory suffix='.php'>ocs-provider/</directory>
                <file>apps.php</file>
        </testsuite>
        <!-- filters for code coverage -->