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

@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Message\MessageInterface;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
@@ -42,17 +43,21 @@ protected function setUp()
     /**
      * Test add simple related, up-sells, cross-sells product
      *
-     * @dataProvider addRelatedUpSellCrossSellProductsProvider
      * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
      * @magentoDbIsolation enabled
      * @param array $postData
      * @return void
      */
-    public function testAddRelatedUpSellCrossSellProducts(array $postData): void
+    public function testAddRelatedUpSellCrossSellProducts(): void
     {
+        $postData = $this->getPostData();
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product/save');
+        $this->assertSessionMessages(
+            $this->equalTo(['You saved the product.']),
+            MessageInterface::TYPE_SUCCESS
+        );
         $product = $this->productRepository->get('simple');
         $this->assertEquals(
             $this->getExpectedLinks($postData['links']),
@@ -62,34 +67,30 @@ public function testAddRelatedUpSellCrossSellProducts(array $postData): void
     }
 
     /**
-     * Provide test data for testAddRelatedUpSellCrossSellProducts().
+     * Get post data for the request
      *
      * @return array
      */
-    public function addRelatedUpSellCrossSellProductsProvider(): array
+    public function getPostData(): array
     {
         return [
-            [
-                'post_data' => [
-                    'product' => [
-                        'attribute_set_id' => '4',
-                        'status' => '1',
-                        'name' => 'Simple Product',
-                        'sku' => 'simple',
-                        'url_key' => 'simple-product',
-                    ],
-                    'links' => [
-                        'upsell' => [
-                            ['id' => '10'],
-                        ],
-                        'crosssell' => [
-                            ['id' => '11'],
-                        ],
-                        'related' => [
-                            ['id' => '12'],
-                        ],
-                    ]
-                ]
+            'product' => [
+                'attribute_set_id' => '4',
+                'status' => '1',
+                'name' => 'Simple Product',
+                'sku' => 'simple',
+                'url_key' => 'simple-product',
+            ],
+            'links' => [
+                'upsell' => [
+                    ['id' => '10'],
+                ],
+                'crosssell' => [
+                    ['id' => '11'],
+                ],
+                'related' => [
+                    ['id' => '12'],
+                ],
             ]
         ];
     }
@@ -123,23 +124,19 @@ private function getActualLinks(ProductInterface $product): array
     {
         $actualLinks = [];
         foreach ($this->linkTypes as $linkType) {
-            $products = [];
-            $actualLinks[$linkType] = [];
+            $ids = [];
             switch ($linkType) {
                 case 'upsell':
-                    $products = $product->getUpSellProducts();
+                    $ids = $product->getUpSellProductIds();
                     break;
                 case 'crosssell':
-                    $products = $product->getCrossSellProducts();
+                    $ids = $product->getCrossSellProductIds();
                     break;
                 case 'related':
-                    $products = $product->getRelatedProducts();
+                    $ids = $product->getRelatedProductIds();
                     break;
             }
-            /** @var ProductInterface|Product $productItem */
-            foreach ($products as $productItem) {
-                $actualLinks[$linkType][] = $productItem->getId();
-            }
+            $actualLinks[$linkType] = $ids;
         }
 
         return $actualLinks;

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

@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductLinkInterface;
+use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductLink\Link;
@@ -62,7 +63,7 @@ class LinksTest extends TestCase
         ],
     ];
 
-    /** @var ProductRepositoryInterface $productRepository */
+    /** @var ProductRepositoryInterface */
     private $productRepository;
 
     /** @var ObjectManager */
@@ -71,6 +72,9 @@ class LinksTest extends TestCase
     /** @var ProductResource */
     private $productResource;
 
+    /** @var ProductLinkInterfaceFactory */
+    private $productLinkInterfaceFactory;
+
     /**
      * @inheritdoc
      */
@@ -80,6 +84,7 @@ protected function setUp()
         $this->objectManager = Bootstrap::getObjectManager();
         $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         $this->productResource = $this->objectManager->create(ProductResource::class);
+        $this->productLinkInterfaceFactory = $this->objectManager->create(ProductLinkInterfaceFactory::class);
     }
 
     /**
@@ -203,14 +208,15 @@ private function getProductData(array $productFixture): array
      *
      * @param ProductInterface|Product $product
      * @param array $productData
+     * @return void
      */
     private function setCustomProductLinks(ProductInterface $product, array $productData): void
     {
         $productLinks = [];
         foreach ($productData as $linkType => $links) {
             foreach ($links as $data) {
-                /** @var Link $productLink */
-                $productLink = $this->objectManager->create(ProductLinkInterface::class);
+                /** @var ProductLinkInterface|Link $productLink */
+                $productLink = $this->productLinkInterfaceFactory->create();
                 $productLink->setSku('simple');
                 $productLink->setLinkedProductSku($data['sku']);
                 if (isset($data['position'])) {