AC-15049 : [CE] PHPUnit 12: Upgrade Security & Authentication related test cases

shashi011 · shashi011 · commit 9e21556dfd70 · 2025-11-11T17:22:17.000+05:30
diff --git a/app/code/Magento/Captcha/Test/Unit/Cron/DeleteExpiredImagesTest.php b/app/code/Magento/Captcha/Test/Unit/Cron/DeleteExpiredImagesTest.php
@@ -8,6 +8,7 @@
 namespace Magento\Captcha\Test\Unit\Cron;
 
 use Magento\Captcha\Cron\DeleteExpiredImages;
+use Magento\Captcha\Helper\Adminhtml\Data as AdminhtmlData;
 use Magento\Captcha\Helper\Data;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Write;
@@ -74,7 +75,7 @@ class DeleteExpiredImagesTest extends TestCase
     protected function setUp(): void
     {
         $this->_helper = $this->createMock(Data::class);
-        $this->_adminHelper = $this->createMock(\Magento\Captcha\Helper\Adminhtml\Data::class);
+        $this->_adminHelper = $this->createMock(AdminhtmlData::class);
         $this->_filesystem = $this->createMock(Filesystem::class);
         $this->_directory = $this->createMock(Write::class);
         $this->_storeManager = $this->createMock(StoreManager::class);
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php
@@ -63,6 +63,11 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * @param $isRequired
+     * @param $captchaGenerations
+     * @param $expectedConfig
+     */
     #[DataProvider('getConfigDataProvider')]
     public function testGetConfig($isRequired, $captchaGenerations, $expectedConfig)
     {
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Config/FontTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Config/FontTest.php
@@ -49,6 +49,12 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * Test toOptionArray() with data provider below
+     *
+     * @param array $fonts
+     * @param array $expectedResult
+     */
     #[DataProvider('toOptionArrayDataProvider')]
     public function testToOptionArray($fonts, $expectedResult)
     {
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Config/Form/BackendTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Config/Form/BackendTest.php
@@ -49,6 +49,12 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * Test toOptionArray() with data provider below
+     *
+     * @param string|array $config
+     * @param array $expectedResult
+     */
     #[DataProvider('toOptionArrayDataProvider')]
     public function testToOptionArray($config, $expectedResult)
     {
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Config/Form/FrontendTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Config/Form/FrontendTest.php
@@ -49,6 +49,12 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * Test toOptionArray() with data provider below
+     *
+     * @param string|array $config
+     * @param array $expectedResult
+     */
     #[DataProvider('toOptionArrayDataProvider')]
     public function testToOptionArray($config, $expectedResult)
     {
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
@@ -13,6 +13,7 @@
 use Magento\Checkout\Model\Session;
 use Magento\Customer\Controller\Ajax\Login;
 use Magento\Framework\App\Request\Http;
+use Magento\Framework\Controller\Result\Json as ResultJson;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
@@ -86,7 +87,7 @@ protected function setUp(): void
             JsonFactory::class,
             ['create']
         );
-        $this->resultJsonMock = $this->createMock(\Magento\Framework\Controller\Result\Json::class);
+        $this->resultJsonMock = $this->createMock(ResultJson::class);
         $this->requestMock = $this->createMock(Http::class);
         $this->loginControllerMock = $this->createMock(Login::class);
 
@@ -180,6 +181,10 @@ public function testAroundExecuteIncorrectCaptcha()
         $this->assertEquals($this->resultJsonMock, $this->model->aroundExecute($this->loginControllerMock, $closure));
     }
 
+    /**
+     * @param string $username
+     * @param array $requestContent
+     */
     #[DataProvider('aroundExecuteCaptchaIsNotRequired')]
     public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent)
     {
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
@@ -393,6 +393,10 @@ protected function _getStoreStub()
         return $store;
     }
 
+    /**
+     * @param boolean $expectedResult
+     * @param string $formId
+     */
     #[DataProvider('isShownToLoggedInUserDataProvider')]
     public function testIsShownToLoggedInUser($expectedResult, $formId)
     {
@@ -417,6 +421,10 @@ public static function isShownToLoggedInUserDataProvider()
         ];
     }
 
+    /**
+     * @param string $string
+     * @throws \ReflectionException
+     */
     #[DataProvider('generateWordProvider')]
     public function testGenerateWord($string)
     {
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckContactUsFormObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckContactUsFormObserverTest.php
@@ -15,6 +15,7 @@
 use Magento\Framework\App\ActionFlag;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\Response\Http as ResponseHttp;
 use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Message\ManagerInterface;
@@ -142,7 +143,7 @@ public function testCheckContactUsFormRedirectsCustomerWithWarningMessageWhenCap
         $postData = ['name' => 'Some Name'];
 
         $request = $this->createMock(Http::class);
-        $response = $this->createMock(\Magento\Framework\App\Response\Http::class);
+        $response = $this->createMock(ResponseHttp::class);
         $request->method('getPost')
             ->with(Data::INPUT_NAME_FIELD_VALUE, null)
             ->willReturn([$formId => $captchaValue]);
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckForgotpasswordObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckForgotpasswordObserverTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\ActionFlag;
 use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\Response\Http as ResponseHttp;
 use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Message\ManagerInterface;
@@ -96,7 +97,7 @@ public function testCheckForgotpasswordRedirects()
         $redirectUrl = 'http://magento.com/customer/account/forgotpassword/';
 
         $request = $this->createMock(Http::class);
-        $response = $this->createMock(\Magento\Framework\App\Response\Http::class);
+        $response = $this->createMock(ResponseHttp::class);
         $request->expects(
             $this->any()
         )->method(
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserCreateObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserCreateObserverTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\ActionFlag;
 use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\Response\Http as ResponseHttp;
 use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Message\ManagerInterface;
@@ -123,7 +124,7 @@ public function testCheckUserCreateRedirectsError()
             $redirectUrl
         );
 
-        $response = $this->createMock(\Magento\Framework\App\Response\Http::class);
+        $response = $this->createMock(ResponseHttp::class);
         $response->expects($this->once())->method('setRedirect')->with($redirectUrl);
 
         $this->_urlManager->expects(
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserEditObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserEditObserverTest.php
@@ -17,6 +17,7 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\ActionFlag;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Request\Http as RequestHttp;
 use Magento\Framework\App\Response\Http;
 use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\Event\Observer;
@@ -117,7 +118,7 @@ public function testExecute()
             ->willReturn($captcha);
 
         $response = $this->createMock(Http::class);
-        $request = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $request = $this->createMock(RequestHttp::class);
         $request->expects($this->any())
             ->method('getPost')
             ->with(Data::INPUT_NAME_FIELD_VALUE, null)
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserLoginObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserLoginObserverTest.php
@@ -18,6 +18,7 @@
 use Magento\Customer\Model\Url;
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\ActionFlag;
+use Magento\Framework\App\Request\Http as RequestHttp;
 use Magento\Framework\App\Response\Http;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Message\ManagerInterface;
@@ -131,7 +132,7 @@ public function testExecute()
             ->method('setRedirect')
             ->with($redirectUrl);
 
-        $request = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $request = $this->createMock(RequestHttp::class);
         $request->expects($this->any())
             ->method('getPost')
             ->with('login')
diff --git a/app/code/Magento/JwtFrameworkAdapter/Test/Unit/Model/JweFactoryTest.php b/app/code/Magento/JwtFrameworkAdapter/Test/Unit/Model/JweFactoryTest.php
@@ -77,6 +77,13 @@ public static function getCreateCases(): array
 
     /**
      * Test "create" method.
+     *
+     * @param array $headers
+     * @param string $content
+     * @param array|null $unprotected
+     * @param array|null $perRecipient
+     * @param string $payloadClass
+     * @return void
      */
     #[DataProvider('getCreateCases')]
     public function testCreate(
diff --git a/app/code/Magento/JwtFrameworkAdapter/Test/Unit/Model/JwsFactoryTest.php b/app/code/Magento/JwtFrameworkAdapter/Test/Unit/Model/JwsFactoryTest.php
@@ -72,6 +72,12 @@ public static function getCreateCases(): array
 
     /**
      * Test "create" method.
+     *
+     * @param array $headers
+     * @param string $content
+     * @param array|null $unprotected
+     * @param string $payloadClass
+     * @return void
      */
     #[DataProvider('getCreateCases')]
     public function testCreate(
diff --git a/app/code/Magento/JwtFrameworkAdapter/Test/Unit/Model/UnsecuredJwtFactoryTest.php b/app/code/Magento/JwtFrameworkAdapter/Test/Unit/Model/UnsecuredJwtFactoryTest.php
@@ -78,6 +78,12 @@ public static function getCreateCases(): array
 
     /**
      * Test "create" method.
+     *
+     * @param array $headers
+     * @param string $content
+     * @param array|null $unprotected
+     * @param string $payloadClass
+     * @return void
      */
     #[DataProvider('getCreateCases')]
     public function testCreate(
diff --git a/app/code/Magento/Security/Test/Unit/Model/Plugin/AuthTest.php b/app/code/Magento/Security/Test/Unit/Model/Plugin/AuthTest.php
@@ -12,6 +12,7 @@
 use Magento\Security\Model\AdminSessionInfo;
 use Magento\Security\Model\AdminSessionsManager;
 use Magento\Security\Model\Plugin\Auth;
+use Magento\Backend\Model\Auth as BackendAuth;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -40,7 +41,7 @@ class AuthTest extends TestCase
     protected $currentSession;
 
     /**
-     * @var \Magento\Backend\Model\Auth
+     * @var BackendAuth
      */
     protected $authMock;
 
@@ -69,7 +70,7 @@ protected function setUp(): void
             ['isOtherSessionsTerminated']
         );
 
-        $this->authMock =  $this->createMock(\Magento\Backend\Model\Auth::class);
+        $this->authMock =  $this->createMock(BackendAuth::class);
 
         $this->model = $this->objectManager->getObject(
             Auth::class,
diff --git a/app/code/Magento/Security/Test/Unit/Model/Plugin/UserValidationRulesTest.php b/app/code/Magento/Security/Test/Unit/Model/Plugin/UserValidationRulesTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Validator\DataObject;
 use Magento\Security\Model\Plugin\UserValidationRules;
 use Magento\Security\Model\UserExpiration\Validator;
+use Magento\User\Model\UserValidationRules as UserModelValidationRules;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -27,7 +28,7 @@ class UserValidationRulesTest extends TestCase
     private $plugin;
 
     /**
-     * @var \Magento\User\Model\UserValidationRules|MockObject
+     * @var UserModelValidationRules|MockObject
      */
     private $userValidationRules;
 
@@ -37,16 +38,16 @@ class UserValidationRulesTest extends TestCase
     private $validator;
 
     /**
-     * @var \Magento\User\Model\UserValidationRules
+     * @var UserModelValidationRules
      */
     private $rules;
 
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
         $userExpirationValidator = $this->createMock(Validator::class);
-        $this->userValidationRules = $this->createMock(\Magento\User\Model\UserValidationRules::class);
-        $this->rules = $objectManager->getObject(\Magento\User\Model\UserValidationRules::class);
+        $this->userValidationRules = $this->createMock(UserModelValidationRules::class);
+        $this->rules = $objectManager->getObject(UserModelValidationRules::class);
         $this->validator = $this->createMock(DataObject::class);
         $this->plugin =
             $objectManager->getObject(
diff --git a/app/code/Magento/Security/Test/Unit/Model/SecurityManagerTest.php b/app/code/Magento/Security/Test/Unit/Model/SecurityManagerTest.php
@@ -10,6 +10,7 @@
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
+use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Security\Model\Config\Source\ResetMethod;
@@ -116,7 +117,7 @@ protected function setUp(): void
      */
     public function testConstructorException()
     {
-        $securityChecker = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
+        $securityChecker = $this->createMock(MessageManagerInterface::class);
 
         $this->expectException(LocalizedException::class);
         $this->expectExceptionMessage(
diff --git a/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/DeleteTest.php b/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/DeleteTest.php
@@ -121,6 +121,10 @@ protected function setUp(): void
     /**
      * Test method \Magento\User\Controller\Adminhtml\User\Delete::execute
      *
+     * @param string $currentUserPassword
+     * @param int $userId
+     * @param int $currentUserId
+     * @param string $resultMethod
      * @return void
      */
     #[DataProvider('executeDataProvider')]
diff --git a/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/SaveTest.php b/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/SaveTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\User\Controller\Adminhtml\User\Save;
@@ -80,7 +81,7 @@ protected function setUp(): void
             Session::class,
             ['setUserData']
         );
-        $registryMock = $this->createMock(\Magento\Framework\Registry::class);
+        $registryMock = $this->createMock(Registry::class);
         $this->contextMock = $this->createMock(Context::class);
         $this->userFactoryMock->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php b/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php
diff --git a/app/code/Magento/User/Test/Unit/Observer/Backend/AuthObserverTest.php b/app/code/Magento/User/Test/Unit/Observer/Backend/AuthObserverTest.php

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,11 @@ protected function setUp(): void`
`63`	`63`	`);`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ /**`
	`67`	`+ * @param $isRequired`
	`68`	`+ * @param $captchaGenerations`
	`69`	`+ * @param $expectedConfig`
	`70`	`+ */`
`66`	`71`	`#[DataProvider('getConfigDataProvider')]`
`67`	`72`	`public function testGetConfig($isRequired, $captchaGenerations, $expectedConfig)`
`68`	`73`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,12 @@ protected function setUp(): void`
`49`	`49`	`);`
`50`	`50`	`}`
`51`	`51`
	`52`	`+ /**`
	`53`	`+ * Test toOptionArray() with data provider below`
	`54`	`+ *`
	`55`	`+ * @param array $fonts`
	`56`	`+ * @param array $expectedResult`
	`57`	`+ */`
`52`	`58`	`#[DataProvider('toOptionArrayDataProvider')]`
`53`	`59`	`public function testToOptionArray($fonts, $expectedResult)`
`54`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,10 @@ protected function _getStoreStub()`
`393`	`393`	`return $store;`
`394`	`394`	`}`
`395`	`395`
	`396`	`+ /**`
	`397`	`+ * @param boolean $expectedResult`
	`398`	`+ * @param string $formId`
	`399`	`+ */`
`396`	`400`	`#[DataProvider('isShownToLoggedInUserDataProvider')]`
`397`	`401`	`public function testIsShownToLoggedInUser($expectedResult, $formId)`
`398`	`402`	`{`
`@@ -417,6 +421,10 @@ public static function isShownToLoggedInUserDataProvider()`
`417`	`421`	`];`
`418`	`422`	`}`
`419`	`423`
	`424`	`+ /**`
	`425`	`+ * @param string $string`
	`426`	`+ * @throws \ReflectionException`
	`427`	`+ */`
`420`	`428`	`#[DataProvider('generateWordProvider')]`
`421`	`429`	`public function testGenerateWord($string)`
`422`	`430`	`{`