Merge remote-tracking branch 'origin/AC-15497' into AC-15050

Author: manishranjan-adobe

app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Config\Data\ConfigData;
 use Magento\Framework\Setup\Option\TextConfigOption;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -56,13 +57,8 @@ protected function setUp(): void
         ];
 
         $this->objectManager = new ObjectManager($this);
-        $this->connectionValidatorMock = $this->getMockBuilder(ConnectionValidator::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->connectionValidatorMock = $this->createMock(ConnectionValidator::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
 
         $this->model = $this->objectManager->getObject(
             ConfigOptionsList::class,
@@ -131,8 +127,8 @@ public function testGetOptions()
     /**
      * @param array $options
      * @param array $expectedConfigData
-     * @dataProvider getCreateConfigDataProvider
      */
+    #[DataProvider('getCreateConfigDataProvider')]
     public function testCreateConfig($options, $expectedConfigData)
     {
         $result = $this->model->createConfig($options, $this->deploymentConfigMock);

app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/BackButtonTest.php

@@ -26,7 +26,7 @@ class BackButtonTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->urlBuilderMock = $this->getMockForAbstractClass(UrlInterface::class);
+        $this->urlBuilderMock = $this->createMock(UrlInterface::class);
         $this->block = new BackButton(
             $this->urlBuilderMock
         );

app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/DoneButtonTest.php

@@ -12,6 +12,8 @@
 use Magento\Framework\Bulk\BulkStatusInterface;
 use Magento\Framework\Bulk\OperationInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\Attributes\DataProvider;
+
 use PHPUnit\Framework\TestCase;
 
 class DoneButtonTest extends TestCase
@@ -33,8 +35,8 @@ class DoneButtonTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->bulkStatusMock = $this->getMockForAbstractClass(BulkStatusInterface::class);
-        $this->requestMock = $this->getMockForAbstractClass(RequestInterface::class);
+        $this->bulkStatusMock = $this->createMock(BulkStatusInterface::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
         $this->block = new DoneButton(
             $this->bulkStatusMock,
             $this->requestMock
@@ -45,8 +47,8 @@ protected function setUp(): void
      * @param int $failedCount
      * @param int $buttonsParam
      * @param array $expectedResult
-     * @dataProvider getButtonDataProvider
      */
+    #[DataProvider('getButtonDataProvider')]
     public function testGetButtonData($failedCount, $buttonsParam, $expectedResult)
     {
         $uuid = 'some standard uuid string';

app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/RetryButtonTest.php

@@ -10,6 +10,7 @@
 use Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\RetryButton;
 use Magento\AsynchronousOperations\Model\Operation\Details;
 use Magento\Framework\App\RequestInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -33,7 +34,7 @@ class RetryButtonTest extends TestCase
     protected function setUp(): void
     {
         $this->detailsMock = $this->createMock(Details::class);
-        $this->requestMock = $this->getMockForAbstractClass(RequestInterface::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
         $this->block = new RetryButton(
             $this->detailsMock,
             $this->requestMock
@@ -43,8 +44,8 @@ protected function setUp(): void
     /**
      * @param int $failedCount
      * @param array $expectedResult
-     * @dataProvider getButtonDataProvider
      */
+    #[DataProvider('getButtonDataProvider')]
     public function testGetButtonData($failedCount, $expectedResult)
     {
         $details = ['failed_retriable' => $failedCount];

app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/DetailsTest.php

@@ -11,6 +11,7 @@
 use Magento\Backend\Model\Menu;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ViewInterface;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Framework\View\LayoutInterface;
@@ -26,6 +27,8 @@
  */
 class DetailsTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var MockObject
      */
@@ -49,8 +52,8 @@ class DetailsTest extends TestCase
     protected function setUp(): void
     {
         $objectManager =  new ObjectManager($this);
-        $this->viewMock = $this->getMockForAbstractClass(ViewInterface::class);
-        $this->requestMock = $this->getMockForAbstractClass(RequestInterface::class);
+        $this->viewMock = $this->createMock(ViewInterface::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
         $this->resultFactoryMock = $this->createMock(PageFactory::class);
         $this->model = $objectManager->getObject(
             Details::class,
@@ -68,12 +71,12 @@ public function testExecute()
         $id = '42';
         $parameterName = 'uuid';
         $itemId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations';
-        $layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);
+        $layoutMock = $this->createMock(LayoutInterface::class);
 
-        $blockMock = $this->getMockBuilder(BlockInterface::class)
-            ->addMethods(['setActive', 'getMenuModel'])
-            ->onlyMethods(['toHtml'])
-            ->getMockForAbstractClass();
+        $blockMock = $this->createPartialMockWithReflection(
+            BlockInterface::class,
+            ['setActive', 'getMenuModel', 'toHtml']
+        );
         $menuModelMock = $this->createMock(Menu::class);
         $this->viewMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
         $layoutMock->expects($this->once())->method('getBlock')->willReturn($blockMock);

app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/RetryTest.php

@@ -66,7 +66,7 @@ protected function setUp(): void
         $objectManager = new ObjectManager($this);
         $this->bulkManagementMock = $this->createMock(BulkManagement::class);
         $this->notificationManagementMock = $this->createMock(BulkNotificationManagement::class);
-        $this->requestMock = $this->getMockForAbstractClass(RequestInterface::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
         $this->resultFactoryMock = $this->createPartialMock(ResultFactory::class, ['create']);
         $this->jsonResultMock = $this->createMock(Json::class);
 

app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Index/IndexTest.php

@@ -11,6 +11,7 @@
 use Magento\Backend\Model\Menu;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ViewInterface;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Framework\View\LayoutInterface;
@@ -26,6 +27,8 @@
  */
 class IndexTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var MockObject
      */
@@ -49,8 +52,8 @@ class IndexTest extends TestCase
     protected function setUp(): void
     {
         $objectManager =  new ObjectManager($this);
-        $this->viewMock = $this->getMockForAbstractClass(ViewInterface::class);
-        $this->requestMock = $this->getMockForAbstractClass(RequestInterface::class);
+        $this->viewMock = $this->createMock(ViewInterface::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
         $this->resultFactoryMock = $this->createMock(PageFactory::class);
 
         $this->model = $objectManager->getObject(
@@ -68,17 +71,17 @@ public function testExecute()
     {
         $itemId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations';
         $prependText = 'Bulk Actions Log';
-        $layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);
+        $layoutMock = $this->createMock(LayoutInterface::class);
         $menuModelMock = $this->createMock(Menu::class);
         $pageMock = $this->createMock(Page::class);
         $pageConfigMock = $this->createMock(Config::class);
         $titleMock = $this->createMock(Title::class);
         $this->resultFactoryMock->expects($this->once())->method('create')->willReturn($pageMock);
 
-        $blockMock = $this->getMockBuilder(BlockInterface::class)
-            ->addMethods(['setActive', 'getMenuModel'])
-            ->onlyMethods(['toHtml'])
-            ->getMockForAbstractClass();
+        $blockMock = $this->createPartialMockWithReflection(
+            BlockInterface::class,
+            ['setActive', 'getMenuModel', 'toHtml']
+        );
 
         $this->viewMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
         $layoutMock->expects($this->once())->method('getBlock')->willReturn($blockMock);

app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Notification/DismissTest.php

@@ -47,7 +47,7 @@ protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
         $this->notificationManagementMock = $this->createMock(BulkNotificationManagement::class);
-        $this->requestMock = $this->getMockForAbstractClass(RequestInterface::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
         $this->resultFactoryMock = $this->createPartialMock(ResultFactory::class, ['create']);
 
         $this->jsonResultMock = $this->createMock(Json::class);

app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Cron/BulkCleanupTest.php

@@ -52,7 +52,7 @@ class BulkCleanupTest extends TestCase
     protected function setUp(): void
     {
         $this->dateTimeMock = $this->createMock(DateTime::class);
-        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
         $this->metadataPoolMock = $this->createMock(MetadataPool::class);
         $this->timeMock = $this->createMock(\Magento\Framework\Stdlib\DateTime\DateTime::class);
@@ -72,8 +72,8 @@ public function testExecute()
         $bulkLifetimeMultiplier = 10;
         $bulkLifetime = 3600 * 24 * $bulkLifetimeMultiplier;
 
-        $adapterMock = $this->getMockForAbstractClass(AdapterInterface::class);
-        $entityMetadataMock = $this->getMockForAbstractClass(EntityMetadataInterface::class);
+        $adapterMock = $this->createMock(AdapterInterface::class);
+        $entityMetadataMock = $this->createMock(EntityMetadataInterface::class);
 
         $this->metadataPoolMock->expects($this->once())->method('getMetadata')->with($this->stringContains($entityType))
             ->willReturn($entityMetadataMock);

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

@@ -12,6 +12,7 @@
 use Magento\AsynchronousOperations\Model\AccessValidator;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\EntityManager\EntityManager;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -39,7 +40,7 @@ class AccessValidatorTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->userContextMock = $this->getMockForAbstractClass(UserContextInterface::class);
+        $this->userContextMock = $this->createMock(UserContextInterface::class);
         $this->entityManagerMock = $this->createMock(EntityManager::class);
         $this->bulkSummaryFactoryMock = $this->createPartialMock(
             BulkSummaryInterfaceFactory::class,
@@ -54,15 +55,15 @@ protected function setUp(): void
     }
 
     /**
-     * @dataProvider summaryDataProvider
      * @param string $bulkUserId
      * @param bool $expectedResult
      */
+    #[DataProvider('summaryDataProvider')]
     public function testIsAllowed($bulkUserId, $expectedResult)
     {
         $adminId = 1;
         $uuid = 'test-001';
-        $bulkSummaryMock = $this->getMockForAbstractClass(BulkSummaryInterface::class);
+        $bulkSummaryMock = $this->createMock(BulkSummaryInterface::class);
 
         $this->bulkSummaryFactoryMock->expects($this->once())->method('create')->willReturn($bulkSummaryMock);
         $this->entityManagerMock->expects($this->once())