#8810 - Solved api functional test issue

Author: sanjay-wagento

app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php

@@ -69,7 +69,7 @@ public function add($entityType, $attributeCode, $option)
         try {
             $this->resourceModel->save($attribute);
             if ($optionLabel && $attribute->getAttributeCode()) {
-                $option->setValue($attribute->getSource()->getOptionId($optionLabel));
+                $this->setOptionValue($option, $attribute, $optionLabel);
             }
         } catch (\Exception $e) {
             throw new StateException(__('Cannot save attribute %1', $attributeCode));
@@ -151,4 +151,26 @@ private function getOptionId($option)
     {
         return $option->getValue() ?: 'new_option';
     }
+
+    /**
+     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
+     * @param \Magento\Eav\Api\Data\AttributeInterface $attribute
+     * @param string $optionLabel
+     * @return void
+     */
+    public function setOptionValue($option, $attribute, $optionLabel)
+    {
+        if ($optionId = $attribute->getSource()->getOptionId($optionLabel)) {
+            $option->setValue($attribute->getSource()->getOptionId($optionId));
+        } else {
+            if (is_array($option->getStoreLabels())) {
+                foreach ($option->getStoreLabels() as $label) {
+                    if ($optionId = $attribute->getSource()->getOptionId($label->getLabel())) {
+                        $option->setValue($attribute->getSource()->getOptionId($optionId));
+                        break;
+                    }
+                }
+            }
+        }
+    }
 }

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php

@@ -74,7 +74,7 @@ public function testAdd($optionData)
             ]
         );
 
-        $this->assertTrue($response);
+        $this->assertNotNull($response[AttributeOptionInterface::VALUE]);
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
         $this->assertEquals(

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php

@@ -42,7 +42,7 @@ public function testAdd($optionData)
             ]
         );
 
-        $this->assertTrue($response);
+        $this->assertNotNull($response[AttributeOptionInterface::VALUE]);
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
         $this->assertEquals(