Merge remote-tracking branch 'origin/BUG#AC-3157' into Spartans_2_4_6_Quality_Backlog

Author: glo82145

app/code/Magento/Tax/Pricing/Render/Adjustment.php

@@ -183,8 +183,7 @@ public function displayPriceExcludingTax()
      */
     public function getDataPriceType(): string
     {
-        return $this->amountRender->getPriceType() === 'finalPrice'
-            ? 'basePrice'
-            : 'base' . ucfirst($this->amountRender->getPriceType());
+        $priceType = $this->amountRender->getPriceType();
+        return $priceType === 'finalPrice' ? 'basePrice' : ($priceType ? 'base' . ucfirst($priceType) : '');
     }
 }

app/code/Magento/Tax/Test/Unit/Pricing/Render/AdjustmentTest.php

@@ -29,8 +29,6 @@
 class AdjustmentTest extends TestCase
 {
     /**
-     * Context mock
-     *
      * @var \Magento\Framework\View\Element\Template\Context
      */
     protected $contextMock;
@@ -54,6 +52,11 @@ class AdjustmentTest extends TestCase
      */
     protected $model;
 
+    /**
+     * @var AmountRenderInterface
+     */
+    protected $amountRender;
+
     /**
      * Init mocks and model
      */
@@ -350,4 +353,33 @@ public function testGetHtmlBoth()
 
         $this->model->render($amountRender, $arguments);
     }
+
+    /**
+     * test for method getDataPriceType
+     * @dataProvider dataPriceTypeDataProvider
+     */
+    public function testGetDataPriceType(?string $priceType, string $priceTypeValue): void
+    {
+        $amountRender = $this->getMockBuilder(Amount::class)
+            ->addMethods(['getPriceType'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $amountRender->expects($this->atLeastOnce())
+            ->method('getPriceType')
+            ->willReturn($priceType);
+        $this->model->render($amountRender, []);
+        //no exception is thrown
+        $this->assertEquals($priceTypeValue, $this->model->getDataPriceType());
+        $this->assertIsString($this->model->getDataPriceType());
+    }
+
+    /**
+     * data provider for testGetDataPriceType
+     *
+     * @return array
+     */
+    public function dataPriceTypeDataProvider(): array
+    {
+        return [['finalPrice', 'basePrice'], [null, '']];
+    }
 }