fix unit tests

Author: engcom-Charlie

app/code/Magento/AsynchronousOperations/Test/Unit/Model/AccessManagerTest.php

@@ -12,35 +12,40 @@
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\EntityManager\EntityManager;
 use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-class AccessManagerTest extends \PHPUnit\Framework\TestCase
+class AccessManagerTest extends TestCase
 {
     /**
      * @var AccessManager
      */
     private $model;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject
      */
     private $userContextMock;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject
      */
     private $entityManagerMock;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject
      */
     private $bulkSummaryFactoryMock;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject
      */
     private $authorizationMock;
 
-    protected function setUp()
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
     {
         $this->userContextMock = $this->createMock(UserContextInterface::class);
         $this->entityManagerMock = $this->createMock(EntityManager::class);
@@ -60,31 +65,38 @@ protected function setUp()
 
     /**
      * @dataProvider summaryDataProvider
-     * @param string $bulkUserId
+     * @param int $bulkUserId
      * @param bool $expectedResult
+     * @return void
      */
-    public function testIsAllowedForBulkUuid($bulkUserId, $expectedResult)
+    public function testIsAllowedForBulkUuid(int $bulkUserId, bool $expectedResult): void
     {
         $adminId = 1;
         $uuid = 'test-001';
         $bulkSummaryMock = $this->createMock(BulkSummaryInterface::class);
 
-        $this->bulkSummaryFactoryMock->expects($this->once())->method('create')->willReturn($bulkSummaryMock);
+        $this->bulkSummaryFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($bulkSummaryMock);
         $this->entityManagerMock->expects($this->once())
             ->method('load')
             ->with($bulkSummaryMock, $uuid)
             ->willReturn($bulkSummaryMock);
 
-        $bulkSummaryMock->expects($this->once())->method('getUserId')->willReturn($bulkUserId);
-        $this->userContextMock->expects($this->once())->method('getUserId')->willReturn($adminId);
+        $bulkSummaryMock->expects($this->once())
+            ->method('getUserId')
+            ->willReturn($bulkUserId);
+        $this->userContextMock->expects($this->once())
+            ->method('getUserId')
+            ->willReturn($adminId);
 
         $this->assertEquals($this->model->isAllowedForBulkUuid($uuid), $expectedResult);
     }
 
     /**
      * @return array
      */
-    public static function summaryDataProvider()
+    public static function summaryDataProvider(): array
     {
         return [
             [2, false],

app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/System/Message/Collection/Synchronized/PluginTest.php

@@ -11,6 +11,7 @@
 use Magento\AdminNotification\Model\System\Message;
 use Magento\AdminNotification\Model\System\MessageFactory;
 use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\AsynchronousOperations\Model\AccessManager;
 use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
 use Magento\AsynchronousOperations\Model\BulkSummary;
 use Magento\AsynchronousOperations\Model\Operation\Details;
@@ -19,6 +20,7 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Bulk\BulkStatusInterface;
+use Magento\Framework\Encryption\Encryptor;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -78,7 +80,12 @@ class PluginTest extends TestCase
     private $statusMapper;
 
     /**
-     * @var string
+     * @var AccessManager|MockObject
+     */
+    private $accessManager;
+
+    /**
+     * @var Encryptor|MockObject
      */
     private $encryptor;
 
@@ -97,6 +104,8 @@ protected function setUp(): void
         $this->collectionMock = $this->createMock(Synchronized::class);
         $this->bulkNotificationMock = $this->createMock(BulkNotificationManagement::class);
         $this->statusMapper = $this->createMock(StatusMapper::class);
+        $this->accessManager = $this->createMock(AccessManager::class);
+        $this->encryptor = $this->createMock(Encryptor::class);
         $this->plugin = new Plugin(
             $this->messagefactoryMock,
             $this->bulkStatusMock,
@@ -114,8 +123,7 @@ public function testAfterToArrayIfNotAllowed()
         $result = [];
         $this->accessManager
             ->expects($this->once())
-            ->method('isAllowed')
-            ->with($this->resourceName)
+            ->method('isOwnActionsAllowed')
             ->willReturn(false);
         $this->assertEquals($result, $this->plugin->afterToArray($this->collectionMock, $result));
     }

app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/AdminNotification/PluginTest.php

@@ -9,7 +9,6 @@
 
 use Magento\AdminNotification\Ui\Component\DataProvider\DataProvider;
 use Magento\AsynchronousOperations\Ui\Component\AdminNotification\Plugin;
-use Magento\Framework\AuthorizationInterface;
 use Magento\AsynchronousOperations\Model\AccessManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -22,16 +21,14 @@ class PluginTest extends TestCase
     private $plugin;
 
     /**
-     * @var MockObject
+     * @var AccessManager|MockObject
      */
-    private $authorizationMock;
+    private $accessMangerMock;
 
     protected function setUp(): void
     {
-        $this->authorizationMock = $this->getMockForAbstractClass(AuthorizationInterface::class);
-        $this->plugin = new Plugin(
-            $this->authorizationMock
-        );
+        $this->accessMangerMock = $this->createMock(AccessManager::class);
+        $this->plugin = new Plugin($this->accessMangerMock);
     }
 
     public function testAfterGetMeta()
@@ -49,7 +46,10 @@ public function testAfterGetMeta()
             ]
         ];
         $dataProviderMock = $this->createMock(DataProvider::class);
-        $this->authorizationMock->expects($this->once())->method('isAllowed')->willReturn(true);
+        $this->accessMangerMock->expects($this->once())
+            ->method('isOwnActionsAllowed')
+            ->willReturn(true);
+
         $this->assertEquals($expectedResult, $this->plugin->afterGetMeta($dataProviderMock, $result));
     }
 }

app/code/Magento/AsynchronousOperations/Ui/Component/AdminNotification/Plugin.php

@@ -25,8 +25,6 @@ class Plugin
     private $isAllowed;
 
     /**
-     * Plugin constructor.
-     *
      * @param AccessManager $accessManager
      */
     public function __construct(
@@ -43,14 +41,13 @@ public function __construct(
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterGetMeta(
-        DataProvider $dataProvider,
-        $result
-    ) {
+    public function afterGetMeta(DataProvider $dataProvider, $result)
+    {
         if (!isset($this->isAllowed)) {
             $this->isAllowed = $this->accessManager->isOwnActionsAllowed();
         }
         $result['columns']['arguments']['data']['config']['isAllowed'] = $this->isAllowed;
+
         return $result;
     }
 }