Merge remote-tracking branch 'origin/AC-15501-Newletter-GiftCard' into Arrows-AC-14808-v4

Author: manishranjan-adobe

app/code/Magento/Contact/Test/Unit/Block/ContactFormTest.php

@@ -44,9 +44,7 @@ protected function setUp(): void
             ->onlyMethods(['getUrlBuilder'])
             ->getMock();
 
-        $this->urlBuilderMock = $this->getMockBuilder(UrlInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $this->urlBuilderMock = $this->createMock(UrlInterface::class);
 
         $this->contextMock->expects($this->any())
             ->method('getUrlBuilder')

app/code/Magento/Contact/Test/Unit/Controller/Index/IndexTest.php

@@ -49,35 +49,29 @@ class IndexTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->configMock = $this->getMockBuilder(ConfigInterface::class)
-            ->getMockForAbstractClass();
+        $this->configMock = $this->createMock(ConfigInterface::class);
 
         $contextMock = $this->getMockBuilder(Context::class)
             ->onlyMethods(
                 ['getRequest', 'getResponse', 'getResultFactory', 'getUrl']
             )->disableOriginalConstructor(
             )->getMock();
 
-        $this->urlMock = $this->getMockBuilder(UrlInterface::class)
-            ->getMockForAbstractClass();
+        $this->urlMock = $this->createMock(UrlInterface::class);
 
         $contextMock->expects($this->any())
             ->method('getUrl')
             ->willReturn($this->urlMock);
 
         $contextMock->expects($this->any())
             ->method('getRequest')
-            ->willReturn($this->getMockBuilder(RequestInterface::class)
-            ->getMockForAbstractClass());
+            ->willReturn($this->createMock(RequestInterface::class));
 
         $contextMock->expects($this->any())
             ->method('getResponse')
-            ->willReturn($this->getMockBuilder(ResponseInterface::class)
-            ->getMockForAbstractClass());
+            ->willReturn($this->createMock(ResponseInterface::class));
 
-        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->resultFactoryMock = $this->createMock(ResultFactory::class);
 
         $contextMock->expects($this->once())
             ->method('getResultFactory')
@@ -97,7 +91,7 @@ protected function setUp(): void
      */
     public function testExecute(): void
     {
-        $resultStub = $this->getMockForAbstractClass(ResultInterface::class);
+        $resultStub = $this->createMock(ResultInterface::class);
         $this->resultFactoryMock->expects($this->once())
             ->method('create')
             ->with(ResultFactory::TYPE_PAGE)

app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php

@@ -18,6 +18,7 @@
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\UrlInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -72,14 +73,13 @@ class PostTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->mailMock = $this->getMockBuilder(MailInterface::class)
-            ->getMockForAbstractClass();
+        $this->mailMock = $this->createMock(MailInterface::class);
         $contextMock = $this->createPartialMock(
             Context::class,
             ['getRequest', 'getResponse', 'getResultRedirectFactory', 'getUrl', 'getRedirect', 'getMessageManager']
         );
-        $this->urlMock = $this->getMockForAbstractClass(UrlInterface::class);
-        $this->messageManagerMock = $this->getMockForAbstractClass(ManagerInterface::class);
+        $this->urlMock = $this->createMock(UrlInterface::class);
+        $this->messageManagerMock = $this->createMock(ManagerInterface::class);
         $this->requestStub = $this->createPartialMock(
             Http::class,
             ['getPostValue', 'getParams', 'getParam', 'isPost']
@@ -96,15 +96,14 @@ protected function setUp(): void
             ->method('create')
             ->willReturn($this->redirectResultMock);
 
-        $this->dataPersistorMock = $this->getMockBuilder(DataPersistorInterface::class)
-            ->getMockForAbstractClass();
+        $this->dataPersistorMock = $this->createMock(DataPersistorInterface::class);
 
         $contextMock->expects($this->any())
             ->method('getRequest')
             ->willReturn($this->requestStub);
         $contextMock->expects($this->any())
             ->method('getResponse')
-            ->willReturn($this->getMockForAbstractClass(ResponseInterface::class));
+            ->willReturn($this->createMock(ResponseInterface::class));
         $contextMock->expects($this->any())
             ->method('getMessageManager')
             ->willReturn($this->messageManagerMock);
@@ -138,8 +137,8 @@ public function testExecuteEmptyPost(): void
      * Test exceute post validation
      *
      * @param array $postData
-     * @dataProvider postDataProvider
      */
+    #[DataProvider('postDataProvider')]
     public function testExecutePostValidation($postData): void
     {
         $this->stubRequestPostData($postData);

app/code/Magento/Contact/Test/Unit/Controller/IndexTest.php

@@ -43,13 +43,10 @@ class IndexTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->configMock = $this->getMockBuilder(ConfigInterface::class)
-            ->getMockForAbstractClass();
+        $this->configMock = $this->createMock(ConfigInterface::class);
 
-        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
-            ->getMockForAbstractClass();
-        $responseMock = $this->getMockBuilder(ResponseInterface::class)
-            ->getMockForAbstractClass();
+        $this->requestMock = $this->createMock(RequestInterface::class);
+        $responseMock = $this->createMock(ResponseInterface::class);
 
         $contextMock = $this->getMockBuilder(Context::class)
             ->onlyMethods(['getRequest', 'getResponse'])

app/code/Magento/Contact/Test/Unit/Helper/DataTest.php

@@ -54,7 +54,7 @@ class DataTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
 
         $contextMock = $this->getMockBuilder(Context::class)
             ->onlyMethods(['getScopeConfig'])
@@ -159,7 +159,7 @@ public function testGetUserEmail(): void
             ->method('isLoggedIn')
             ->willReturn(true);
 
-        $customerDataObject = $this->getMockForAbstractClass(CustomerInterface::class);
+        $customerDataObject = $this->createMock(CustomerInterface::class);
         $customerDataObject->expects($this->once())
             ->method('getEmail')
             ->willReturn('[email protected]');
@@ -181,8 +181,7 @@ public function testGetPostValue(): void
             'email' => 'Some Email'
         ];
 
-        $dataPersistorMock = $this->getMockBuilder(DataPersistorInterface::class)
-            ->getMockForAbstractClass();
+        $dataPersistorMock = $this->createMock(DataPersistorInterface::class);
         $dataPersistorMock->expects($this->once())
             ->method('get')
             ->with('contact_us')

app/code/Magento/Contact/Test/Unit/Model/ConfigTest.php

@@ -11,6 +11,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -34,10 +35,7 @@ class ConfigTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
-            ->onlyMethods(['getValue', 'isSetFlag'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
 
         $objectManager = new ObjectManagerHelper($this);
         $this->model = $objectManager->getObject(
@@ -52,8 +50,8 @@ protected function setUp(): void
      * Test isEnabled()
      *
      * @return void
-     * @dataProvider isEnabledDataProvider
      */
+    #[DataProvider('isEnabledDataProvider')]
     public function testIsEnabled($isSetFlag, $result): void
     {
         $this->scopeConfigMock->expects($this->once())

app/code/Magento/Contact/Test/Unit/Model/MailTest.php

@@ -53,15 +53,10 @@ class MailTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->configMock = $this->getMockBuilder(ConfigInterface::class)
-            ->getMockForAbstractClass();
-        $this->transportBuilderMock = $this->getMockBuilder(TransportBuilder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->inlineTranslationMock = $this->getMockBuilder(StateInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->storeManagerMock = $this->getMockForAbstractClass(StoreManagerInterface::class);
+        $this->configMock = $this->createMock(ConfigInterface::class);
+        $this->transportBuilderMock = $this->createMock(TransportBuilder::class);
+        $this->inlineTranslationMock = $this->createMock(StateInterface::class);
+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
 
         $objectManager = new ObjectManagerHelper($this);
         $this->mail = $objectManager->getObject(
@@ -83,9 +78,9 @@ public function testSendMail(): void
         $email = '[email protected]';
         $templateVars = ['comment' => 'Comment'];
 
-        $transport = $this->getMockForAbstractClass(TransportInterface::class);
+        $transport = $this->createMock(TransportInterface::class);
 
-        $storeMock = $this->getMockForAbstractClass(StoreInterface::class);
+        $storeMock = $this->createMock(StoreInterface::class);
         $storeMock->expects($this->once())->method('getId')->willReturn(555);
 
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);

app/code/Magento/Contact/Test/Unit/Plugin/UserDataProvider/ViewModelTest.php

@@ -10,14 +10,18 @@
 use Magento\Contact\Plugin\UserDataProvider\ViewModel as ViewModelPlugin;
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 
 /**
  * Unit test for the ViewModelPlugin class
  */
 class ViewModelTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var ArgumentInterface|MockObject
      */
@@ -38,23 +42,23 @@ class ViewModelTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->viewModelMock = $this->getMockForAbstractClass(ArgumentInterface::class);
+        $this->viewModelMock = $this->createMock(ArgumentInterface::class);
         $this->blockMock = $this->createMock(DataObject::class);
 
         $this->plugin = new ViewModelPlugin($this->viewModelMock);
     }
 
-    /**
-     * @dataProvider dataProvider
-     */
+    #[DataProvider('dataProvider')]
     public function testBeforeToHtml($hasDataResult, $setDataExpects)
     {
         $this->blockMock->expects($this->once())
             ->method('hasData')
             ->with('view_model')
             ->willReturn($hasDataResult);
 
-        $this->blockMock->expects($setDataExpects)
+        $invocationMatcher = $this->createInvocationMatcher($setDataExpects);
+
+        $this->blockMock->expects($invocationMatcher)
             ->method('setData')
             ->with('view_model', $this->viewModelMock);
 
@@ -66,11 +70,11 @@ public static function dataProvider()
         return [
             'view model was not preset before' => [
                 'hasDataResult' => false,
-                'setDataExpects' => self::once(),
+                'setDataExpects' => 'once',
             ],
             'view model was pre-installed before' => [
                 'hasDataResult' => true,
-                'setDataExpects' => self::never(),
+                'setDataExpects' => 'never',
             ]
         ];
     }

app/code/Magento/GiftMessage/Test/Unit/Block/Cart/GiftOptionsTest.php

@@ -40,12 +40,7 @@ protected function setUp(): void
         $this->context = $this->createMock(Context::class);
         $this->jsonEncoderMock = $this->createMock(Encoder::class);
         $this->compositeConfigProvider = $this->createMock(CompositeConfigProvider::class);
-        $this->layoutProcessorMock = $this->getMockForAbstractClass(
-            LayoutProcessorInterface::class,
-            [],
-            '',
-            false
-        );
+        $this->layoutProcessorMock = $this->createMock(LayoutProcessorInterface::class);
         $this->model = new GiftOptions(
             $this->context,
             $this->jsonEncoderMock,

app/code/Magento/GiftMessage/Test/Unit/Block/Cart/Item/Renderer/Actions/GiftOptionsTest.php

@@ -40,23 +40,13 @@ class GiftOptionsTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->contextMock = $this->getMockBuilder(Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->contextMock = $this->createMock(Context::class);
 
-        $this->jsonEncoderMock = $this->getMockBuilder(Encoder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->jsonEncoderMock = $this->createMock(Encoder::class);
 
-        $this->compositeConfigProvider = $this->getMockBuilder(CompositeConfigProvider::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->compositeConfigProvider = $this->createMock(CompositeConfigProvider::class);
 
-        $this->layoutProcessorMock = $this->getMockBuilder(
-            LayoutProcessorInterface::class
-        )
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $this->layoutProcessorMock = $this->createMock(LayoutProcessorInterface::class);
 
         $this->model = new GiftOptions(
             $this->contextMock,
@@ -71,9 +61,7 @@ public function testGetJsLayout()
         /**
          * @var Item|MockObject $itemMock
          */
-        $itemMock = $this->getMockBuilder(Item::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $itemMock = $this->createMock(Item::class);
 
         $this->layoutProcessorMock->expects($this->once())
             ->method('process')