Merge remote-tracking branch 'origin/AC-2719' into gl_pr_arrows_april21_2022

Author: rimple-saini

app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php

@@ -40,8 +40,6 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
     protected $_useLinkForAsLowAs = false;
 
     /**
-     * Customer id
-     *
      * @var null|int
      */
     protected $_customerId = null;
@@ -52,22 +50,16 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
     protected $httpContext;
 
     /**
-     * Customer visitor
-     *
      * @var \Magento\Customer\Model\Visitor
      */
     protected $_customerVisitor;
 
     /**
-     * Catalog product visibility
-     *
      * @var \Magento\Catalog\Model\Product\Visibility
      */
     protected $_catalogProductVisibility;
 
     /**
-     * Item collection factory
-     *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory
      */
     protected $_itemCollectionFactory;
@@ -205,6 +197,9 @@ public function getProductAttributeValue($product, $attribute)
         } else {
             $value = $product->getData($attribute->getAttributeCode());
         }
+        if (is_array($value)) {
+            return __('N/A');
+        }
         return (string)$value == '' ? __('No') : $value;
     }
 

app/code/Magento/Catalog/Test/Unit/Block/Product/Compare/ListCompareTest.php

@@ -10,6 +10,8 @@
 use Magento\Catalog\Block\Product\Compare\ListCompare;
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\Entity\Attribute\AttributeInterface;
+use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
 use Magento\Framework\Pricing\Render;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Layout;
@@ -50,6 +52,48 @@ protected function tearDown(): void
         $this->block = null;
     }
 
+    /**
+     * @dataProvider attributeDataProvider
+     * @param array $attributeData
+     * @param string $expectedResult
+     */
+    public function testProductAttributeValue($attributeData, $expectedResult)
+    {
+        $attribute = $this->getMockBuilder(AttributeInterface::class)
+            ->addMethods(['getAttributeCode', 'getSourceModel', 'getFrontendInput', 'getFrontend'])
+            ->getMockForAbstractClass();
+        $frontEndModel = $this->createPartialMock(AbstractFrontend::class, ['getValue']);
+        $productMock = $this->createPartialMock(Product::class, ['getId', 'getData', 'hasData']);
+        $productMock->expects($this->any())
+            ->method('hasData')
+            ->with($attributeData['attribute_code'])
+            ->willReturn(true);
+        $productMock->expects($this->any())
+            ->method('getData')
+            ->with($attributeData['attribute_code'])
+            ->willReturn($attributeData['attribute_value']);
+        $attribute->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeData['attribute_code']);
+        $attribute->expects($this->any())
+            ->method('getSourceModel')
+            ->willReturn($attributeData['source_model']);
+        $attribute->expects($this->any())
+            ->method('getFrontendInput')
+            ->willReturn($attributeData['frontend_input']);
+        $frontEndModel->expects($this->any())
+            ->method('getValue')
+            ->with($productMock)
+            ->willReturn($attributeData['attribute_value']);
+        $attribute->expects($this->any())
+            ->method('getFrontend')
+            ->willReturn($frontEndModel);
+        $this->assertEquals(
+            $expectedResult,
+            $this->block->getProductAttributeValue($productMock, $attribute)
+        );
+    }
+
     public function testGetProductPrice()
     {
         //Data
@@ -84,4 +128,31 @@ public function testGetProductPrice()
 
         $this->assertEquals($expectedResult, $this->block->getProductPrice($product, '-compare-list-top'));
     }
+
+    /**
+     * @return array
+     */
+    public function attributeDataProvider(): array
+    {
+        return [
+            [
+                'attributeData' => [
+                    'attribute_code' => 'tier_price',
+                    'source_model' => null,
+                    'frontend_input' => 'text',
+                    'attribute_value' => []
+                ],
+                'expectedResult' => __('N/A')
+            ],
+            [
+                'attributeData' => [
+                    'attribute_code' => 'special_price',
+                    'source_model' => null,
+                    'frontend_input' => 'decimal',
+                    'attribute_value' => 50.00
+                ],
+                'expectedResult' => '50.00'
+            ]
+        ];
+    }
 }