Fix integration and static tests

Author: VladimirZaets

app/code/Magento/MediaContent/Model/ContentAssetLink.php

@@ -16,9 +16,6 @@
  */
 class ContentAssetLink implements ContentAssetLinkInterface
 {
-    private const ASSET_ID = 'asset_id';
-    private const CONTENT_IDENTITY = 'content_identity';
-
     /**
      * @var ContentAssetLinkExtensionInterface|null
      */
@@ -35,14 +32,16 @@ class ContentAssetLink implements ContentAssetLinkInterface
     private $assetId;
 
     /**
+     * ContentAssetLink constructor.
+     * @param int $assetId
+     * @param ContentIdentityInterface $contentIdentity
      * @param ContentAssetLinkExtensionInterface|null $extensionAttributes
      */
     public function __construct(
         int $assetId,
         ContentIdentityInterface $contentIdentity,
         ?ContentAssetLinkExtensionInterface $extensionAttributes = null
-    )
-    {
+    ) {
         $this->assetId = $assetId;
         $this->contentIdentity = $contentIdentity;
         $this->extensionAttributes = $extensionAttributes;
@@ -71,4 +70,12 @@ public function getExtensionAttributes(): ?ContentAssetLinkExtensionInterface
     {
         return $this->extensionAttributes;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExtensionAttributes(?ContentAssetLinkExtensionInterface $extensionAttributes): void
+    {
+        $this->extensionAttributes = $extensionAttributes;
+    }
 }

app/code/Magento/MediaContent/Model/ContentIdentity.php

@@ -66,8 +66,16 @@ public function getField(): string
     /**
      * @inheritdoc
      */
-    public function getExtensionAttributes(): ContentIdentityExtensionInterface
+    public function getExtensionAttributes(): ?ContentIdentityExtensionInterface
     {
         return $this->extensionAttributes;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExtensionAttributes(?ContentIdentityExtensionInterface $extensionAttributes): void
+    {
+        $this->extensionAttributes = $extensionAttributes;
+    }
 }

app/code/Magento/MediaContent/Model/DeleteContentAssetLinks.php

@@ -66,6 +66,8 @@ public function execute(array $contentAssetLinks): void
     }
 
     /**
+     * Build sql where condition
+     *
      * @param ContentAssetLinkInterface[] $contentAssetLinks
      * @return string
      */
@@ -76,13 +78,16 @@ private function buildWhereSqlPart(array $contentAssetLinks): string
         foreach ($contentAssetLinks as $contentAssetLink) {
             $assetId = $connection->quoteInto(self::ASSET_ID . ' = ?', $contentAssetLink->getAssetId());
             $entityId = $connection->quoteInto(
-                self::ENTITY_ID . ' = ?', $contentAssetLink->getContentId()->getEntityId()
+                self::ENTITY_ID . ' = ?',
+                $contentAssetLink->getContentId()->getEntityId()
             );
             $entityType = $connection->quoteInto(
-                self::ENTITY_TYPE . ' = ?', $contentAssetLink->getContentId()->getEntityType()
+                self::ENTITY_TYPE . ' = ?',
+                $contentAssetLink->getContentId()->getEntityType()
             );
             $field = $connection->quoteInto(
-                self::FIELD . ' = ?', $contentAssetLink->getContentId()->getField()
+                self::FIELD . ' = ?',
+                $contentAssetLink->getContentId()->getField()
             );
             $condition[] = '(' . $assetId . ' AND ' . $entityId . ' AND ' . $entityType . ' AND ' . $field . ')';
         }

app/code/Magento/MediaContent/Plugin/MediaGalleryAssetDeleteByDirectoryPath.php

@@ -52,6 +52,8 @@ public function __construct(
     }
 
     /**
+     * Around plugin on execute method
+     *
      * @param DeleteByDirectoryPathInterface $subject
      * @param \Closure $proceed
      * @param string $directoryPath

app/code/Magento/MediaContent/Plugin/MediaGalleryAssetDeleteByPath.php

@@ -49,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * Around plugin on execute method
+     *
      * @param DeleteByPathInterface $subject
      * @param \Closure $proceed
      * @param string $mediaAssetPath

app/code/Magento/MediaContentApi/Api/Data/ContentAssetLinkInterface.php

@@ -37,4 +37,12 @@ public function getAssetId(): int;
      * @return \Magento\MediaContentApi\Api\Data\ContentAssetLinkExtensionInterface|null
      */
     public function getExtensionAttributes(): ?ContentAssetLinkExtensionInterface;
+
+    /**
+     * Set extension attributes
+     *
+     * @param \Magento\MediaContentApi\Api\Data\ContentAssetLinkExtensionInterface|null $extensionAttributes
+     * @return void
+     */
+    public function setExtensionAttributes(?ContentAssetLinkExtensionInterface $extensionAttributes): void;
 }

app/code/Magento/MediaContentApi/Api/Data/ContentIdentityInterface.php

@@ -43,5 +43,13 @@ public function getField(): string;
      *
      * @return \Magento\MediaContentApi\Api\Data\ContentIdentityExtensionInterface|null
      */
-    public function getExtensionAttributes(): ContentIdentityExtensionInterface;
+    public function getExtensionAttributes(): ?ContentIdentityExtensionInterface;
+
+    /**
+     * Set extension attributes
+     *
+     * @param \Magento\MediaContentApi\Api\Data\ContentIdentityExtensionInterface|null $extensionAttributes
+     * @return void
+     */
+    public function setExtensionAttributes(?ContentIdentityExtensionInterface $extensionAttributes): void;
 }

app/code/Magento/MediaContentApi/Api/ExtractAssetsFromContentEntitiesInterface.php

@@ -20,14 +20,15 @@ class ExtractAssetsFromContentTest extends TestCase
     /**
      * @var ExtractAssetsFromContentInterface
      */
-    private $service;
+    private $extractAssetsFromContent;
 
     /**
      * @inheritdoc
      */
     public function setUp(): void
     {
-        $this->service = Bootstrap::getObjectManager()->get(ExtractAssetsFromContentInterface::class);
+        $this->extractAssetsFromContent = Bootstrap::getObjectManager()
+            ->get(ExtractAssetsFromContentInterface::class);
     }
 
     /**
@@ -41,7 +42,7 @@ public function setUp(): void
      */
     public function testExecute(string $content, array $assetIds): void
     {
-        $assets = $this->service->execute($content);
+        $assets = $this->extractAssetsFromContent->execute($content);
 
         $extractedAssetIds = [];
         foreach ($assets as $asset) {

dev/tests/integration/testsuite/Magento/MediaContent/Model/ExtractAssetsFromContentTest.php

@@ -20,7 +20,7 @@
 /**
  * Test for AssignAssets service
  */
-class AssignGetUnassignTest extends TestCase
+class SaveDeleteContentAssetLinksTest extends TestCase
 {
     /**
      * @var SaveContentAssetLinksInterface
@@ -55,7 +55,7 @@ public function setUp(): void
     }
 
     /**
-     * Assing assets to content, retrieve the data, then unassign assets from content
+     * Save asset to content links, retrieve the data, delete assets to content links
      */
     public function testAssignRetrieveAndUnassign(): void
     {