Change the way the setup method is called for GetById command test

Author: coderimus

app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionDuringMediaAssetInitializationTest.php

@@ -19,7 +19,7 @@
 use Zend\Db\Adapter\Driver\Pdo\Statement;
 
 /**
- * Test the GetById command model with exception during media asset initialization
+ * Test the GetById command with exception during media asset initialization
  */
 class GetByIdExceptionDuringMediaAssetInitializationTest extends \PHPUnit\Framework\TestCase
 {

app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionNoSuchEntityTest.php

@@ -52,26 +52,21 @@ class GetByIdExceptionNoSuchEntityTest extends \PHPUnit\Framework\TestCase
      */
     private $statementMock;
 
-    /**
-     * @var LoggerInterface|MockObject
-     */
-    private $logger;
-
     /**
      * Initialize basic test class mocks
      */
     protected function setUp(): void
     {
         $resourceConnection = $this->createMock(ResourceConnection::class);
         $this->assetFactory = $this->createMock(AssetInterfaceFactory::class);
-        $this->logger = $this->createMock(LoggerInterface::class);
+        $logger = $this->createMock(LoggerInterface::class);
 
         $this->getMediaAssetById = (new ObjectManager($this))->getObject(
             GetById::class,
             [
                 'resourceConnection' => $resourceConnection,
                 'assetFactory' => $this->assetFactory,
-                'logger' =>  $this->logger,
+                'logger' =>  $logger,
             ]
         );
         $this->adapter = $this->createMock(AdapterInterface::class);

app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionOnGetDataTest.php

@@ -41,6 +41,11 @@ class GetByIdExceptionOnGetDataTest extends \PHPUnit\Framework\TestCase
      */
     private $selectStub;
 
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
     /**
      * @var Statement|MockObject
      */
@@ -53,14 +58,14 @@ protected function setUp(): void
     {
         $resourceConnection = $this->createMock(ResourceConnection::class);
         $assetFactory = $this->createMock(AssetInterfaceFactory::class);
-        $logger = $this->createMock(LoggerInterface::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
 
         $this->getMediaAssetById = (new ObjectManager($this))->getObject(
             GetById::class,
             [
                 'resourceConnection' => $resourceConnection,
                 'assetFactory' => $assetFactory,
-                'logger' =>  $logger,
+                'logger' =>  $this->logger,
             ]
         );
         $this->adapter = $this->createMock(AdapterInterface::class);
@@ -83,6 +88,9 @@ public function testExceptionDuringGetMediaAssetData(): void
         $this->adapter->method('query')->willThrowException(new \Exception());
 
         $this->expectException(IntegrationException::class);
+        $this->logger->expects($this->any())
+            ->method('critical')
+            ->willReturnSelf();
 
         $this->getMediaAssetById->execute(self::MEDIA_ASSET_STUB_ID);
     }

app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdSuccessfulTest.php

@@ -19,9 +19,9 @@
 use Zend\Db\Adapter\Driver\Pdo\Statement;
 
 /**
- * Test the GetById command model
+ * Test the GetById command successful scenario
  */
-class GetByIdTest extends \PHPUnit\Framework\TestCase
+class GetByIdSuccessfulTest extends \PHPUnit\Framework\TestCase
 {
     private const MEDIA_ASSET_STUB_ID = 1;