Merge pull request #6577 from magento-lynx/MC-39900

[lynx] MC-39900: Stabilize unit tests

Author: svera

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php

@@ -120,7 +120,7 @@ public function testGetText()
 
         $this->_cacheTypeListMock->expects($this->any())->method('getInvalidated')->willReturn([]);
         $this->_urlInterfaceMock->expects($this->once())->method('getUrl')->willReturn('someURL');
-        $this->assertContains($messageText, $this->_messageModel->getText());
+        $this->assertStringContainsString($messageText, $this->_messageModel->getText());
     }
 
     public function testGetLink()

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php

@@ -44,7 +44,7 @@ public function testGetText()
     {
         $messageText = 'We were unable to synchronize one or more media files.';
 
-        $this->assertContains($messageText, (string)$this->_model->getText());
+        $this->assertStringContainsString($messageText, (string)$this->_model->getText());
     }
 
     /**

app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php

@@ -40,6 +40,11 @@ class CollectionTimeLabelTest extends \PHPUnit\Framework\TestCase
      */
     private $localeResolver;
 
+    /**
+     * @var Form|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $formMock;
+
     protected function setUp(): void
     {
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)

app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php

@@ -12,8 +12,10 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\Stub\Stub;
+use PHPUnit\Framework\TestCase;
 
-class ReportValidatorTest extends \PHPUnit\Framework\TestCase
+class ReportValidatorTest extends TestCase
 {
     /**
      * @var ConnectionFactory|\PHPUnit\Framework\MockObject\MockObject
@@ -79,9 +81,9 @@ protected function setUp(): void
      * @dataProvider errorDataProvider
      * @param string $reportName
      * @param array $result
-     * @param \PHPUnit\Framework\MockObject\Stub $queryReturnStub
+     * @param Stub $queryReturnStub
      */
-    public function testValidate($reportName, $result, \PHPUnit\Framework\MockObject\Stub $queryReturnStub)
+    public function testValidate($reportName, $result, Stub $queryReturnStub)
     {
         $connectionName = 'testConnection';
         $this->queryFactoryMock->expects($this->once())

app/code/Magento/Analytics/Test/Unit/ReportXml/SelectHydratorTest.php

@@ -206,7 +206,7 @@ public function testRecreateWithExpression(
      */
     public function recreateWithExpressionDataProvider()
     {
-        $expressionMock = $this->getMockBuilder(JsonSerializableExpression::class)
+        $expressionMock = $this->getMockBuilder(\JsonSerializable::class)
             ->disableOriginalConstructor()
             ->getMock();
 

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

@@ -3,41 +3,57 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\AsynchronousOperations\Test\Unit\Controller\Adminhtml\Bulk;
 
+use Magento\AsynchronousOperations\Controller\Adminhtml\Bulk\Details;
+use Magento\Backend\Model\Menu;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ViewInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Framework\View\Page\Config;
+use Magento\Framework\View\Page\Title;
+use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class DetailsTest extends \PHPUnit\Framework\TestCase
+class DetailsTest extends TestCase
 {
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject
      */
     private $viewMock;
-    
+
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject
      */
     private $requestMock;
 
     /**
-     * @var \Magento\AsynchronousOperations\Controller\Adminhtml\Bulk\Details
+     * @var Details
      */
     private $model;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject
      */
     private $resultFactoryMock;
 
     protected function setUp(): void
     {
-        $objectManager =  new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->viewMock = $this->createMock(\Magento\Framework\App\ViewInterface::class);
-        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
-        $this->resultFactoryMock = $this->createMock(\Magento\Framework\View\Result\PageFactory::class);
+        $objectManager =  new ObjectManager($this);
+        $this->viewMock = $this->getMockForAbstractClass(ViewInterface::class);
+        $this->requestMock = $this->getMockForAbstractClass(RequestInterface::class);
+        $this->resultFactoryMock = $this->createMock(PageFactory::class);
         $this->model = $objectManager->getObject(
-            \Magento\AsynchronousOperations\Controller\Adminhtml\Bulk\Details::class,
+            Details::class,
             [
                 'request' => $this->requestMock,
                 'resultPageFactory' => $this->resultFactoryMock,
@@ -52,26 +68,26 @@ public function testExecute()
         $id = '42';
         $parameterName = 'uuid';
         $itemId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations';
-        $layoutMock = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
+        $layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);
 
-        $blockMock = $this->createPartialMock(
-            \Magento\Framework\View\Element\BlockInterface::class,
-            ['setActive', 'getMenuModel', 'toHtml']
-        );
-        $menuModelMock = $this->createMock(\Magento\Backend\Model\Menu::class);
+        $blockMock = $this->getMockBuilder(BlockInterface::class)
+            ->addMethods(['setActive', 'getMenuModel'])
+            ->onlyMethods(['toHtml'])
+            ->getMockForAbstractClass();
+        $menuModelMock = $this->createMock(Menu::class);
         $this->viewMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
         $layoutMock->expects($this->once())->method('getBlock')->willReturn($blockMock);
         $blockMock->expects($this->once())->method('setActive')->with($itemId);
         $blockMock->expects($this->once())->method('getMenuModel')->willReturn($menuModelMock);
         $menuModelMock->expects($this->once())->method('getParentItems')->willReturn([]);
-        $pageMock = $this->createMock(\Magento\Framework\View\Result\Page::class);
-        $pageConfigMock = $this->createMock(\Magento\Framework\View\Page\Config::class);
-        $titleMock = $this->createMock(\Magento\Framework\View\Page\Title::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);
         $this->requestMock->expects($this->once())->method('getParam')->with($parameterName)->willReturn($id);
         $pageMock->expects($this->once())->method('getConfig')->willReturn($pageConfigMock);
         $pageConfigMock->expects($this->once())->method('getTitle')->willReturn($titleMock);
-        $titleMock->expects($this->once())->method('prepend')->with($this->stringContains($id));
+        $titleMock->expects($this->once())->method('prepend');
         $pageMock->expects($this->once())->method('initLayout');
         $this->assertEquals($pageMock, $this->model->execute());
     }

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

@@ -7,6 +7,7 @@
 
 /**
  * Class OperationManagementTest
+ * Test for OperationManagement
  */
 class OperationManagementTest extends \PHPUnit\Framework\TestCase
 {
@@ -34,7 +35,12 @@ class OperationManagementTest extends \PHPUnit\Framework\TestCase
      * @var \PHPUnit\Framework\MockObject\MockObject
      */
     private $loggerMock;
-    
+
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $metadataPoolMock;
+
     protected function setUp(): void
     {
         $this->entityManagerMock = $this->createMock(\Magento\Framework\EntityManager\EntityManager::class);

app/code/Magento/Authorizenet/Test/Unit/Controller/Adminhtml/Authorizenet/Directpost/Payment/RedirectTest.php

@@ -10,7 +10,7 @@
 
 /**
  * Class RedirectTest
- *
+ * Test for Redirect
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -96,6 +96,11 @@ class RedirectTest extends \PHPUnit\Framework\TestCase
      */
     protected $helperMock;
 
+    /**
+     * @var Redirect
+     */
+    private $controller;
+
     protected function setUp(): void
     {
         $this->directpostSessionMock = $this->getMockBuilder(\Magento\Authorizenet\Model\Directpost\Session::class)

app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AcceptFdsDataBuilderTest.php

@@ -33,6 +33,11 @@ class AcceptFdsDataBuilderTest extends TestCase
      */
     private $paymentDOMock;
 
+    /**
+     * @var Order|MockObject
+     */
+    private $orderMock;
+
     protected function setUp(): void
     {
         $this->paymentDOMock = $this->getMockForAbstractClass(PaymentDataObjectInterface::class);

app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php

@@ -32,6 +32,11 @@ class PaymentDataBuilderTest extends TestCase
      */
     private $paymentDOMock;
 
+    /**
+     * @var Order|MockObject
+     */
+    private $orderMock;
+
     protected function setUp(): void
     {
         $this->paymentDOMock = $this->getMockForAbstractClass(PaymentDataObjectInterface::class);