MAGETWO-48227: Fix API/Integration tests

 - Refactored save handler and plugin to correct saving attributes

Author: YevSent

app/code/Magento/ConfigurableProduct/Model/Plugin/AroundProductRepositorySave.php

@@ -64,7 +64,7 @@ public function aroundSave(
             return $result;
         }
 
-        $extensionAttributes = $product->getExtensionAttributes();
+        $extensionAttributes = $result->getExtensionAttributes();
         if ($extensionAttributes === null) {
             return $result;
         }
@@ -97,17 +97,9 @@ public function aroundSave(
     private function validateProductLinks(array $attributeCodes, array $linkIds)
     {
         $valueMap = [];
-        if (empty($attributeCodes) && !empty($linkIds)) {
-            throw new InputException(
-                __('The configurable product does not have any variation attribute.')
-            );
-        }
 
         foreach ($linkIds as $productId) {
             $variation = $this->productFactory->create()->load($productId);
-            if (!$variation->getId()) {
-                throw new InputException(__('Product with id "%1" does not exist.', $productId));
-            }
             $valueKey = '';
             foreach ($attributeCodes as $attributeCode) {
                 if (!$variation->getData($attributeCode)) {

app/code/Magento/ConfigurableProduct/Model/Product/SaveHandler.php

@@ -72,10 +72,11 @@ public function execute($entityType, ProductInterface $entity)
             $ids = $this->saveConfigurableProductAttributes($entity, $configurableOptions);
         }
 
-        $this->deleteConfigurableProductAttributes($entity, $ids);
-
         $configurableLinks = (array) $extensionAttributes->getConfigurableProductLinks();
         $this->resourceModel->saveProducts($entity, $configurableLinks);
+        if (empty($configurableLinks) || !empty($ids)) {
+            $this->deleteConfigurableProductAttributes($entity, $ids);
+        }
 
         return $entity;
     }

dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php

@@ -283,7 +283,7 @@ public function testUpdateConfigurableProductLinksWithNonExistingProduct()
             $productId1, $nonExistingId
         ];
 
-        $expectedMessage = 'Product with id "%1" does not exist.';
+        $expectedMessage = 'Unable to save product';
         try {
             $this->saveProduct($response);
             $this->fail("Expected exception");
@@ -296,7 +296,6 @@ public function testUpdateConfigurableProductLinksWithNonExistingProduct()
         } catch (\Exception $e) {
             $errorObj = $this->processRestExceptionResult($e);
             $this->assertEquals($expectedMessage, $errorObj['message']);
-            $this->assertEquals(['0' => '999'], $errorObj['parameters']);
         }
     }
 
@@ -349,8 +348,8 @@ public function testUpdateConfigurableProductLinksWithDuplicateAttributes()
      */
     public function testUpdateConfigurableProductLinksWithWithoutVariationAttributes()
     {
-        $productId1 = 10;
-        $productId2 = 20;
+        $productId1 = 99;
+        $productId2 = 88;
 
         $response = $this->createConfigurableProduct();
 
@@ -360,7 +359,7 @@ public function testUpdateConfigurableProductLinksWithWithoutVariationAttributes
             $productId1, $productId2
         ];
 
-        $expectedMessage = 'The configurable product does not have any variation attribute.';
+        $expectedMessage = 'Unable to save product';
         try {
             $this->saveProduct($response);
             $this->fail("Expected exception");