#26121: special price & tier price are coming in base currency

Adjust unit and integration tests

Author: pmarjan

app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php

@@ -12,11 +12,13 @@
 use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\TierPrice;
+use Magento\Catalog\Model\Product\Price\TierPriceBuilder;
 use Magento\Catalog\Model\Product\Type\Price;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Model\Data\Group;
 use Magento\Customer\Model\GroupManagement;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
@@ -69,6 +71,8 @@ class PriceTest extends TestCase
 
     private $tierPriceExtensionFactoryMock;
 
+    private $priceCurrencyMock;
+
     protected function setUp(): void
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -113,14 +117,27 @@ protected function setUp(): void
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
+        $this->priceCurrencyMock = $this->getMockBuilder(PriceCurrencyInterface::class)
+            ->getMockForAbstractClass();
+        $tierPriceBuilder = $this->objectManagerHelper->getObject(
+            TierPriceBuilder::class,
+            [
+                'tierPriceFactory' => $this->tpFactory,
+                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock,
+                'config' => $this->scopeConfigMock,
+                'storeManager' => $storeMangerMock,
+                'priceCurrency' => $this->priceCurrencyMock,
+            ]
+        );
         $this->model = $this->objectManagerHelper->getObject(
             Price::class,
             [
                 'tierPriceFactory' => $this->tpFactory,
                 'config' => $this->scopeConfigMock,
                 'storeManager' => $storeMangerMock,
                 'groupManagement' => $this->groupManagementMock,
-                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock
+                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock,
+                'tierPriceBuilder' => $tierPriceBuilder
             ]
         );
     }
@@ -234,6 +251,10 @@ function () {
         $this->tierPriceExtensionFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($tierPriceExtensionMock);
+        $this->priceCurrencyMock->expects($this->any())->method('convertAndRound')
+            ->will(
+                $this->onConsecutiveCalls(10, 20)
+            );
 
         // test with the data retrieved as a REST object
         $tpRests = $this->model->getTierPrices($this->product);

dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php

@@ -46,51 +46,51 @@ protected function setUp(): void
             'AdvancedPricingSimple 1' => [
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => '300.000000',
+                    'value'             => 300.00,
                     'qty'               => '10.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '1',
-                    'value'             => '11.000000',
+                    'value'             => 11.00,
                     'qty'               => '11.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '3',
-                    'value'             => '14.000000',
+                    'value'             => 14.00,
                     'qty'               => '14.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => 160.5,
+                    'value'             => 160.50,
                     'qty'               => '20.0000',
                     'percentage_value'  => '50.00'
                 ]
             ],
             'AdvancedPricingSimple 2' => [
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => '1000000.000000',
+                    'value'             => 1000000.00,
                     'qty'               => '100.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '0',
-                    'value'             => '12.000000',
+                    'value'             => 12.00,
                     'qty'               => '12.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '2',
-                    'value'             => '13.000000',
+                    'value'             => 13.00,
                     'qty'               => '13.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => 327.0,
+                    'value'             => 327.00,
                     'qty'               => '200.0000',
                     'percentage_value'  => '50.00'
                 ]