MC-33068: Make Unit, Integration, Web-API tests compatible with PHPUnit9

Author: fascinosum

app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php

@@ -42,7 +42,7 @@ protected function setUp(): void
             ->getMock();
         $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMockForAbstractClass();
         $objectManager = new ObjectManager($this);
         $this->canViewNotification = $objectManager->getObject(
             CanViewNotification::class,

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/ActionsTest.php

@@ -29,7 +29,7 @@ class ActionsTest extends TestCase
      */
     private $sut;
 
-    protected function setUp() : void
+    protected function setUp(): void
     {
         parent::setUp();
 

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/NoticeTest.php

@@ -27,7 +27,7 @@ class NoticeTest extends TestCase
      */
     private $sut;
 
-    protected function setUp() : void
+    protected function setUp(): void
     {
         parent::setUp();
 

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/SeverityTest.php

@@ -29,7 +29,7 @@ class SeverityTest extends TestCase
      */
     private $sut;
 
-    protected function setUp() : void
+    protected function setUp(): void
     {
         parent::setUp();
 

app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php

@@ -30,7 +30,7 @@ protected function _getBlockInstance($unreadNotifications)
             Unread::class,
             ['getSize', 'setCurPage', 'setPageSize']
         );
-        $notificationList->expects($this->any())->method('getSize')->will($this->returnValue($unreadNotifications));
+        $notificationList->expects($this->any())->method('getSize')->willReturn($unreadNotifications);
 
         $block = $objectManagerHelper->getObject(
             ToolbarEntry::class,
@@ -66,7 +66,7 @@ public function testGetLatestUnreadNotifications()
         $notificationList->expects($this->atLeastOnce())
             ->method('setPageSize')
             ->with(ToolbarEntry::NOTIFICATIONS_NUMBER)
-            ->will($this->returnSelf());
+            ->willReturnSelf();
 
         // 3. Run tested method
         $result = $model->getLatestUnreadNotifications();

app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

@@ -104,7 +104,7 @@ protected function setUp(): void
         $this->productMetadata = $this->getMockBuilder(ProductMetadata::class)
             ->disableOriginalConstructor()->getMock();
 
-        $this->urlBuilder = $this->createMock(UrlInterface::class);
+        $this->urlBuilder = $this->getMockForAbstractClass(UrlInterface::class);
 
         $this->feed = $this->objectManagerHelper->getObject(
             Feed::class,
@@ -146,19 +146,19 @@ public function testCheckUpdate($callInbox, $curlRequest)
 
         $lastUpdate = 0;
         $this->cacheManager->expects($this->once())->method('load')->will(($this->returnValue($lastUpdate)));
-        $this->curlFactory->expects($this->at(0))->method('create')->will($this->returnValue($this->curl));
+        $this->curlFactory->expects($this->at(0))->method('create')->willReturn($this->curl);
         $this->curl->expects($this->once())->method('setConfig')->with($configValues)->willReturnSelf();
-        $this->curl->expects($this->once())->method('read')->will($this->returnValue($curlRequest));
-        $this->backendConfig->expects($this->at(0))->method('getValue')->will($this->returnValue('1'));
-        $this->backendConfig->expects($this->once())->method('isSetFlag')->will($this->returnValue(false));
+        $this->curl->expects($this->once())->method('read')->willReturn($curlRequest);
+        $this->backendConfig->expects($this->at(0))->method('getValue')->willReturn('1');
+        $this->backendConfig->expects($this->once())->method('isSetFlag')->willReturn(false);
         $this->backendConfig->expects($this->at(1))->method('getValue')
-            ->will($this->returnValue('http://feed.magento.com'));
+            ->willReturn('http://feed.magento.com');
         $this->deploymentConfig->expects($this->once())->method('get')
             ->with(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE)
-            ->will($this->returnValue('Sat, 6 Sep 2014 16:46:11 UTC'));
+            ->willReturn('Sat, 6 Sep 2014 16:46:11 UTC');
         if ($callInbox) {
             $this->inboxFactory->expects($this->once())->method('create')
-                ->will($this->returnValue($this->inboxModel));
+                ->willReturn($this->inboxModel);
             $this->inboxModel->expects($this->once())
                 ->method('parse')
                 ->with(
@@ -178,7 +178,7 @@ function ($initialValue, $item) use ($data) {
                         }
                     )
                 )
-                ->will($this->returnSelf());
+                ->willReturnSelf();
         } else {
             $this->inboxFactory->expects($this->never())->method('create');
             $this->inboxModel->expects($this->never())->method('parse');

app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php

@@ -35,19 +35,18 @@ protected function _getServiceInstanceForMarkAsReadTest($notificationId)
         );
         $notification = $this->createPartialMock(
             Inbox::class,
-            ['load', 'getId', 'save', 'setData', '__sleep', '__wakeup']
+            ['load', 'getId', 'save', 'setData', '__sleep', '__wakeup', 'setIsRead']
         );
-        $notification->expects($this->once())->method('load')->with($notificationId)->will($this->returnSelf());
-        $notification->expects($this->once())->method('getId')->will($this->returnValue($notificationId));
+        $notification->expects($this->once())->method('load')->with($notificationId)->willReturnSelf();
+        $notification->expects($this->once())->method('getId')->willReturn($notificationId);
 
         // when notification Id is valid, add additional expectations
         if ($notificationId) {
-            $notification->expects($this->once())->method('save')->will($this->returnSelf());
-            $notification->expects($this->once())->method('setData')
-                ->with('is_read', 1)->will($this->returnSelf());
+            $notification->expects($this->once())->method('save')->willReturnSelf();
+            $notification->expects($this->once())->method('setIsRead')->with(1)->willReturnSelf();
         }
 
-        $notificationFactory->expects($this->once())->method('create')->will($this->returnValue($notification));
+        $notificationFactory->expects($this->once())->method('create')->willReturn($notification);
         return new NotificationService($notificationFactory);
     }
 

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

@@ -37,9 +37,9 @@ class CacheOutdatedTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->_authorizationMock = $this->createMock(AuthorizationInterface::class);
-        $this->_urlInterfaceMock = $this->createMock(UrlInterface::class);
-        $this->_cacheTypeListMock = $this->createMock(TypeListInterface::class);
+        $this->_authorizationMock = $this->getMockForAbstractClass(AuthorizationInterface::class);
+        $this->_urlInterfaceMock = $this->getMockForAbstractClass(UrlInterface::class);
+        $this->_cacheTypeListMock = $this->getMockForAbstractClass(TypeListInterface::class);
 
         $objectManagerHelper = new ObjectManager($this);
         $arguments = [
@@ -64,8 +64,8 @@ public function testGetIdentity($expectedSum, $cacheTypes)
             $this->any()
         )->method(
             'getInvalidated'
-        )->will(
-            $this->returnValue($cacheTypes)
+        )->willReturn(
+            $cacheTypes
         );
         $this->assertEquals($expectedSum, $this->_messageModel->getIdentity());
     }
@@ -76,10 +76,10 @@ public function testGetIdentity($expectedSum, $cacheTypes)
     public function getIdentityDataProvider()
     {
         $cacheTypeMock1 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
-        $cacheTypeMock1->expects($this->any())->method('getCacheType')->will($this->returnValue('Simple'));
+        $cacheTypeMock1->expects($this->any())->method('getCacheType')->willReturn('Simple');
 
         $cacheTypeMock2 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
-        $cacheTypeMock2->expects($this->any())->method('getCacheType')->will($this->returnValue('Advanced'));
+        $cacheTypeMock2->expects($this->any())->method('getCacheType')->willReturn('Advanced');
 
         return [
             ['c13cfaddc2c53e8d32f59bfe89719beb', [$cacheTypeMock1]],
@@ -95,13 +95,13 @@ public function getIdentityDataProvider()
      */
     public function testIsDisplayed($expected, $allowed, $cacheTypes)
     {
-        $this->_authorizationMock->expects($this->once())->method('isAllowed')->will($this->returnValue($allowed));
+        $this->_authorizationMock->expects($this->once())->method('isAllowed')->willReturn($allowed);
         $this->_cacheTypeListMock->expects(
             $this->any()
         )->method(
             'getInvalidated'
-        )->will(
-            $this->returnValue($cacheTypes)
+        )->willReturn(
+            $cacheTypes
         );
         $this->assertEquals($expected, $this->_messageModel->isDisplayed());
     }
@@ -112,7 +112,7 @@ public function testIsDisplayed($expected, $allowed, $cacheTypes)
     public function isDisplayedDataProvider()
     {
         $cacheTypesMock = $this->createPartialMock(\stdClass::class, ['getCacheType']);
-        $cacheTypesMock->expects($this->any())->method('getCacheType')->will($this->returnValue('someVal'));
+        $cacheTypesMock->expects($this->any())->method('getCacheType')->willReturn('someVal');
         $cacheTypes = [$cacheTypesMock, $cacheTypesMock];
         return [
             [false, false, []],
@@ -126,15 +126,15 @@ public function testGetText()
     {
         $messageText = 'One or more of the Cache Types are invalidated';
 
-        $this->_cacheTypeListMock->expects($this->any())->method('getInvalidated')->will($this->returnValue([]));
-        $this->_urlInterfaceMock->expects($this->once())->method('getUrl')->will($this->returnValue('someURL'));
-        $this->assertContains($messageText, $this->_messageModel->getText());
+        $this->_cacheTypeListMock->expects($this->any())->method('getInvalidated')->willReturn([]);
+        $this->_urlInterfaceMock->expects($this->once())->method('getUrl')->willReturn('someURL');
+        $this->assertStringContainsString($messageText, $this->_messageModel->getText());
     }
 
     public function testGetLink()
     {
         $url = 'backend/admin/cache';
-        $this->_urlInterfaceMock->expects($this->once())->method('getUrl')->will($this->returnValue($url));
+        $this->_urlInterfaceMock->expects($this->once())->method('getUrl')->willReturn($url);
         $this->assertEquals($url, $this->_messageModel->getLink());
     }
 }

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

@@ -37,7 +37,7 @@ protected function setUp(): void
         );
 
         $this->_fileStorage = $this->createMock(Flag::class);
-        $this->_fileStorage->expects($this->any())->method('loadSelf')->will($this->returnValue($this->_syncFlagMock));
+        $this->_fileStorage->expects($this->any())->method('loadSelf')->willReturn($this->_syncFlagMock);
 
         $objectManagerHelper = new ObjectManager($this);
         $arguments = ['fileStorage' => $this->_fileStorage];
@@ -50,7 +50,7 @@ protected function setUp(): void
     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());
     }
 
     /**
@@ -70,7 +70,7 @@ public function testIsDisplayed($expectedFirstRun, $data)
         );
 
         $this->_syncFlagMock->expects($this->any())->method('save');
-        $this->_syncFlagMock->expects($this->any())->method('getFlagData')->will($this->returnValue($data));
+        $this->_syncFlagMock->expects($this->any())->method('getFlagData')->willReturn($data);
         //check first call
         $this->assertEquals($expectedFirstRun, $model->isDisplayed());
         //check second call(another branch of if operator)

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

@@ -39,8 +39,8 @@ class SecurityTest extends TestCase
     protected function setUp(): void
     {
         //Prepare objects for constructor
-        $this->cacheMock = $this->createMock(CacheInterface::class);
-        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->cacheMock = $this->getMockForAbstractClass(CacheInterface::class);
+        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->curlFactoryMock = $this->createPartialMock(
             CurlFactory::class,
             ['create']
@@ -68,14 +68,14 @@ protected function setUp(): void
      */
     public function testIsDisplayed($expectedResult, $cached, $response)
     {
-        $this->cacheMock->expects($this->any())->method('load')->will($this->returnValue($cached));
-        $this->cacheMock->expects($this->any())->method('save')->will($this->returnValue(null));
+        $this->cacheMock->expects($this->any())->method('load')->willReturn($cached);
+        $this->cacheMock->expects($this->any())->method('save')->willReturn(null);
 
         $httpAdapterMock = $this->createMock(Curl::class);
-        $httpAdapterMock->expects($this->any())->method('read')->will($this->returnValue($response));
-        $this->curlFactoryMock->expects($this->any())->method('create')->will($this->returnValue($httpAdapterMock));
+        $httpAdapterMock->expects($this->any())->method('read')->willReturn($response);
+        $this->curlFactoryMock->expects($this->any())->method('create')->willReturn($httpAdapterMock);
 
-        $this->scopeConfigMock->expects($this->any())->method('getValue')->will($this->returnValue(null));
+        $this->scopeConfigMock->expects($this->any())->method('getValue')->willReturn(null);
 
         $this->assertEquals($expectedResult, $this->messageModel->isDisplayed());
     }