fix Controller tests

- added pageTitle in code was missing in expectations
- fixed warnings of superflouos parameter
- fixed wrong type of mock

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php
index 5c0814dbf860e8feb36ca2fe774d8d0384701a7d..256f56657952078ff767d854ddd839d38d314fab 100644 (file)
--- a/tests/Core/Controller/AvatarControllerTest.php
+++ b/tests/Core/Controller/AvatarControllerTest.php
@@ -38,6 +38,7 @@ use OCP\Files\File;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
+use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\IAvatar;
 use OCP\IAvatarManager;
 use OCP\ICache;
@@ -59,7 +60,7 @@ class AvatarControllerTest extends \Test\TestCase {
        private $avatarMock;
        /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
        private $userMock;
-       /** @var File|\PHPUnit\Framework\MockObject\MockObject */
+       /** @var ISimpleFile|\PHPUnit\Framework\MockObject\MockObject */
        private $avatarFile;
 
        /** @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */
@@ -115,7 +116,7 @@ class AvatarControllerTest extends \Test\TestCase {
                $this->userManager->method('get')
                        ->willReturnMap([['userId', $this->userMock]]);
 
-               $this->avatarFile = $this->getMockBuilder('OCP\Files\File')->getMock();
+               $this->avatarFile = $this->getMockBuilder(ISimpleFile::class)->getMock();
                $this->avatarFile->method('getContent')->willReturn('image data');
                $this->avatarFile->method('getMimeType')->willReturn('image type');
                $this->avatarFile->method('getEtag')->willReturn('my etag');

diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index 551e8917482f615fc391cbe93f99d2e9c476d5a9..cee3da659944911b377f55ea0e78a0cd6455bd93 100644 (file)
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -228,7 +228,7 @@ class LoginControllerTest extends TestCase {
                        ->willReturn('/default/foo');
 
                $expectedResponse = new RedirectResponse('/default/foo');
-               $this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', '', ''));
+               $this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', ''));
        }
 
        public function testShowLoginFormWithErrorsInSession() {
@@ -279,10 +279,11 @@ class LoginControllerTest extends TestCase {
                        'login',
                        [
                                'alt_login' => [],
+                               'pageTitle' => 'Login'
                        ],
                        'guest'
                );
-               $this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', '', ''));
+               $this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', ''));
        }
 
        public function testShowLoginFormForFlowAuth() {
@@ -303,16 +304,17 @@ class LoginControllerTest extends TestCase {
                        'login',
                        [
                                'alt_login' => [],
+                               'pageTitle' => 'Login'
                        ],
                        'guest'
                );
-               $this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', 'login/flow', ''));
+               $this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', 'login/flow'));
        }
 
        /**
         * @return array
         */
-       public function passwordResetDataProvider() {
+       public function passwordResetDataProvider(): array {
                return [
                        [
                                true,
@@ -371,10 +373,11 @@ class LoginControllerTest extends TestCase {
                        'login',
                        [
                                'alt_login' => [],
+                               'pageTitle' => 'Login'
                        ],
                        'guest'
                );
-               $this->assertEquals($expectedResponse, $this->loginController->showLoginForm('LdapUser', '', ''));
+               $this->assertEquals($expectedResponse, $this->loginController->showLoginForm('LdapUser', ''));
        }
 
        public function testShowLoginFormForUserNamed0() {
@@ -425,10 +428,11 @@ class LoginControllerTest extends TestCase {
                        'login',
                        [
                                'alt_login' => [],
+                               'pageTitle' => 'Login'
                        ],
                        'guest'
                );
-               $this->assertEquals($expectedResponse, $this->loginController->showLoginForm('0', '', ''));
+               $this->assertEquals($expectedResponse, $this->loginController->showLoginForm('0', ''));
        }
 
        public function testLoginWithInvalidCredentials() {