Merge remote-tracking branch 'tango/MC-35934' into PR-10-14

Author: dhorytskyi

app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php

@@ -42,12 +42,15 @@ public function beforeSave($object)
     public function validate($object)
     {
         $attributeCode = $this->getAttribute()->getAttributeCode();
-        $data = $object->getData($attributeCode);
-        if (is_array($data)) {
-            $object->setData($attributeCode, implode(',', array_filter($data)));
-        } elseif (empty($data)) {
-            $object->setData($attributeCode, null);
+        if ($object->hasData($attributeCode)) {
+            $data = $object->getData($attributeCode);
+            if (is_array($data)) {
+                $object->setData($attributeCode, implode(',', array_filter($data)));
+            } elseif (empty($data)) {
+                $object->setData($attributeCode, null);
+            }
         }
+
         return parent::validate($object);
     }
 }

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/ArrayBackendTest.php

@@ -17,40 +17,109 @@ class ArrayBackendTest extends TestCase
     /**
      * @var ArrayBackend
      */
-    protected $_model;
+    private $_model;
 
     /**
      * @var Attribute
      */
-    protected $_attribute;
+    private $_attribute;
 
     protected function setUp(): void
     {
         $this->_attribute = $this->createPartialMock(
             Attribute::class,
-            ['getAttributeCode', '__wakeup']
+            ['getAttributeCode', 'getDefaultValue', '__wakeup']
         );
         $this->_model = new ArrayBackend();
         $this->_model->setAttribute($this->_attribute);
     }
 
     /**
-     * @dataProvider attributeValueDataProvider
+     * @dataProvider validateDataProvider
+     * @param array $productData
+     * @param bool $hasData
+     * @param string|int|float|null $expectedValue
      */
-    public function testValidate($data)
+    public function testValidate(array $productData, bool $hasData, $expectedValue)
     {
-        $this->_attribute->expects($this->atLeastOnce())->method('getAttributeCode')->willReturn('code');
-        $product = new DataObject(['code' => $data, 'empty' => null]);
+        $this->_attribute->expects($this->atLeastOnce())
+            ->method('getAttributeCode')
+            ->willReturn('attr');
+
+        $product = new DataObject($productData);
         $this->_model->validate($product);
-        $this->assertEquals('1,2,3', $product->getCode());
-        $this->assertNull($product->getEmpty());
+        $this->assertEquals($hasData, $product->hasData('attr'));
+        $this->assertEquals($expectedValue, $product->getAttr());
+    }
+
+    /**
+     * @return array
+     */
+    public static function validateDataProvider(): array
+    {
+        return [
+            [
+                ['sku' => 'test1', 'attr' => [1, 2, 3]],
+                true,
+                '1,2,3',
+            ],
+            [
+                ['sku' => 'test1', 'attr' => '1,2,3'],
+                true,
+                '1,2,3',
+            ],
+            [
+                ['sku' => 'test1', 'attr' => null],
+                true,
+                null,
+            ],
+            [
+                ['sku' => 'test1'],
+                false,
+                null,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider beforeSaveDataProvider
+     * @param array $productData
+     * @param string $defaultValue
+     * @param string $expectedValue
+     */
+    public function testBeforeSave(
+        array $productData,
+        string $defaultValue,
+        string $expectedValue
+    ) {
+        $this->_attribute->expects($this->atLeastOnce())
+            ->method('getAttributeCode')
+            ->willReturn('attr');
+        $this->_attribute->expects($this->any())
+            ->method('getDefaultValue')
+            ->willReturn($defaultValue);
+
+        $product = new DataObject($productData);
+        $this->_model->beforeSave($product);
+        $this->assertEquals($expectedValue, $product->getAttr());
     }
 
     /**
      * @return array
      */
-    public static function attributeValueDataProvider()
+    public function beforeSaveDataProvider(): array
     {
-        return [[[1, 2, 3]], ['1,2,3']];
+        return [
+            [
+                ['sku' => 'test1', 'attr' => 'Value 2'],
+                'Default value 1',
+                'Value 2',
+            ],
+            [
+                ['sku' => 'test1'],
+                'Default value 1',
+                'Default value 1',
+            ],
+        ];
     }
 }