MC-20675: Admin: Add/edit/delete related, up-sells, cross-sells products

Author: romadjelf

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/LinksTest.php

@@ -9,7 +9,7 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\ProductRepository;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
@@ -27,7 +27,7 @@ class LinksTest extends AbstractBackendController
         'related',
     ];
 
-    /** @var ProductRepository $productRepository */
+    /** @var ProductRepositoryInterface $productRepository */
     private $productRepository;
 
     /**
@@ -48,20 +48,15 @@ protected function setUp()
      * @param array $postData
      * @return void
      */
-    public function testAddRelatedUpSellCrossSellProducts(array $postData)
+    public function testAddRelatedUpSellCrossSellProducts(array $postData): void
     {
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product/save');
-
-        /** @var Product $product */
         $product = $this->productRepository->get('simple');
-
-        $expectedLinks = $this->getExpectedLinks($postData['links']);
-        $actualLinks = $this->getActualLinks($product);
         $this->assertEquals(
-            $expectedLinks,
-            $actualLinks,
+            $this->getExpectedLinks($postData['links']),
+            $this->getActualLinks($product),
             "Expected linked products do not match actual linked products!"
         );
     }
@@ -111,7 +106,7 @@ private function getExpectedLinks(array $links): array
         foreach ($this->linkTypes as $linkType) {
             $expectedLinks[$linkType] = [];
             foreach ($links[$linkType] as $productData) {
-                $expectedLinks[$linkType][$productData['id']] = $productData;
+                $expectedLinks[$linkType][] = $productData['id'];
             }
         }
 
@@ -121,10 +116,10 @@ private function getExpectedLinks(array $links): array
     /**
      * Get an array of received related, up-sells, cross-sells products
      *
-     * @param Product $product
+     * @param ProductInterface|Product $product
      * @return array
      */
-    private function getActualLinks(Product $product): array
+    private function getActualLinks(ProductInterface $product): array
     {
         $actualLinks = [];
         foreach ($this->linkTypes as $linkType) {
@@ -141,11 +136,9 @@ private function getActualLinks(Product $product): array
                     $products = $product->getRelatedProducts();
                     break;
             }
-            /** @var Product $product */
+            /** @var ProductInterface|Product $productItem */
             foreach ($products as $productItem) {
-                $actualLinks[$linkType][$productItem->getId()] = [
-                    'id' => $productItem->getId(),
-                ];
+                $actualLinks[$linkType][] = $productItem->getId();
             }
         }
 

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/LinksTest.php

@@ -7,11 +7,12 @@
 
 namespace Magento\Catalog\Model\Product;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductLinkInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductLink\Link;
-use Magento\Catalog\Model\ProductRepository;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\TestCase;
@@ -61,12 +62,15 @@ class LinksTest extends TestCase
         ],
     ];
 
-    /** @var ProductRepository $productRepository */
+    /** @var ProductRepositoryInterface $productRepository */
     private $productRepository;
 
     /** @var ObjectManager */
     private $objectManager;
 
+    /** @var ProductResource */
+    private $productResource;
+
     /**
      * @inheritdoc
      */
@@ -75,6 +79,7 @@ protected function setUp()
         parent::setUp();
         $this->objectManager = Bootstrap::getObjectManager();
         $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->productResource = $this->objectManager->create(ProductResource::class);
     }
 
     /**
@@ -90,24 +95,23 @@ protected function setUp()
      */
     public function testEditRemoveRelatedUpSellCrossSellProducts(array $data): void
     {
-        /** @var Product $product */
+        /** @var ProductInterface|Product $product */
         $product = $this->productRepository->get('simple');
         $this->setCustomProductLinks($product, $this->getProductData($data['defaultLinks']));
         $this->productRepository->save($product);
 
         $productData = $this->getProductData($data['productLinks']);
         $this->setCustomProductLinks($product, $productData);
-        $product->save();
+        $this->productResource->save($product);
 
         $product = $this->productRepository->get('simple');
         $expectedLinks = isset($data['expectedProductLinks'])
             ? $this->getProductData($data['expectedProductLinks'])
             : $productData;
-        $actualLinks = $this->getActualLinks($product);
 
         $this->assertEquals(
             $expectedLinks,
-            $actualLinks,
+            $this->getActualLinks($product),
             "Expected linked products do not match actual linked products!"
         );
     }
@@ -187,19 +191,20 @@ private function getProductData(array $productFixture): array
         foreach ($this->linkTypes as $linkType) {
             $productData[$linkType] = [];
             foreach ($productFixture as $data) {
-                $productData[$linkType][$data['id']] = $data;
+                $productData[$linkType][] = $data;
             }
         }
+
         return $productData;
     }
 
     /**
      * Link related, up-sells, cross-sells products received from the array
      *
-     * @param Product $product
+     * @param ProductInterface|Product $product
      * @param array $productData
      */
-    private function setCustomProductLinks(Product $product, array $productData): void
+    private function setCustomProductLinks(ProductInterface $product, array $productData): void
     {
         $productLinks = [];
         foreach ($productData as $linkType => $links) {
@@ -221,10 +226,10 @@ private function setCustomProductLinks(Product $product, array $productData): vo
     /**
      * Get an array of received related, up-sells, cross-sells products
      *
-     * @param Product $product
+     * @param ProductInterface|Product $product
      * @return array
      */
-    private function getActualLinks(Product $product): array
+    private function getActualLinks(ProductInterface $product): array
     {
         $actualLinks = [];
         foreach ($this->linkTypes as $linkType) {
@@ -241,9 +246,9 @@ private function getActualLinks(Product $product): array
                     $products = $product->getRelatedProducts();
                     break;
             }
-            /** @var Product $product */
+            /** @var ProductInterface|Product $productItem */
             foreach ($products as $productItem) {
-                $actualLinks[$linkType][$productItem->getId()] = [
+                $actualLinks[$linkType][] = [
                     'id' => $productItem->getId(),
                     'sku' => $productItem->getSku(),
                     'position' => $productItem->getPosition(),