MAGETWO-52891: [FT] CreateSimpleProductEntityTest failed to recognize a comma and a dot in the product price

 - fix error without changing constructor

Author: Robert He

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php

@@ -31,6 +31,7 @@
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Framework\Currency;
 use Magento\Framework\Locale\Currency as CurrencyLocale;
+Use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class EavTest
@@ -156,9 +157,20 @@ class EavTest extends AbstractModifierTest
      */
     protected $currencyLocaleMock;
 
+    /**
+     * @var ObjectManager
+     */
+    protected $objectManager;
+    
+    /**
+     * @var Eav
+     */
+    protected $eav;
+
     protected function setUp()
     {
         parent::setUp();
+        $this->objectManager = new ObjectManager($this);
         $this->eavConfigMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -265,6 +277,13 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getCurrency'])
             ->getMock();
+        
+        $this->eav =$this->getModel();
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->eav,
+            'localeCurrency',
+            $this->currencyLocaleMock
+        );
     }
 
     /**
@@ -285,7 +304,6 @@ protected function createModel()
             'attributeGroupRepository' => $this->attributeGroupRepositoryMock,
             'sortOrderBuilder' => $this->sortOrderBuilderMock,
             'attributeRepository' => $this->attributeRepositoryMock,
-            'localeCurrency' => $this->currencyLocaleMock,
         ]);
     }
 
@@ -379,6 +397,6 @@ public function testModifyData()
             ->method('getCurrency')
             ->willReturn($this->currencyMock);
 
-        $this->assertEquals($sourceData, $this->getModel()->modifyData([]));
+        $this->assertEquals($sourceData, $this->eav->modifyData([]));
     }
 }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

@@ -112,12 +112,7 @@ class CustomOptions extends AbstractModifier
      * @var UrlInterface
      */
     protected $urlBuilder;
-
-    /**
-     * @var CurrencyInterface
-     */
-    protected $localeCurrency;
-
+    
     /**
      * @var ArrayManager
      */
@@ -128,13 +123,17 @@ class CustomOptions extends AbstractModifier
      */
     protected $meta = [];
 
+    /**
+     * @var CurrencyInterface
+     */
+    private $localeCurrency;
+
     /**
      * @param LocatorInterface $locator
      * @param StoreManagerInterface $storeManager
      * @param ConfigInterface $productOptionsConfig
      * @param ProductOptionsPrice $productOptionsPrice
      * @param UrlInterface $urlBuilder
-     * @param CurrencyInterface $localeCurrency
      * @param ArrayManager $arrayManager
      */
     public function __construct(
@@ -143,15 +142,13 @@ public function __construct(
         ConfigInterface $productOptionsConfig,
         ProductOptionsPrice $productOptionsPrice,
         UrlInterface $urlBuilder,
-        CurrencyInterface $localeCurrency,
         ArrayManager $arrayManager
     ) {
         $this->locator = $locator;
         $this->storeManager = $storeManager;
         $this->productOptionsConfig = $productOptionsConfig;
         $this->productOptionsPrice = $productOptionsPrice;
         $this->urlBuilder = $urlBuilder;
-        $this->localeCurrency = $localeCurrency;
         $this->arrayManager = $arrayManager;
     }
 
@@ -1079,6 +1076,21 @@ protected function getCurrencySymbol()
         return $this->storeManager->getStore()->getBaseCurrency()->getCurrencySymbol();
     }
 
+    /**
+     * The getter function to get the locale currency for real application code
+     *
+     * @return \Magento\Framework\Locale\CurrencyInterface
+     *
+     * @deprecated
+     */
+    private function getLocaleCurrency()
+    {
+        if ($this->localeCurrency === null) {
+            $this->localeCurrency = \Magento\Framework\App\ObjectManager::getInstance()->get(CurrencyInterface::class);
+        }
+        return $this->localeCurrency;
+    }
+    
     /**
      * Format price according to the locale of the currency
      *
@@ -1092,7 +1104,7 @@ protected function formatPrice($value)
         }
 
         $store = $this->storeManager->getStore();
-        $currency = $this->localeCurrency->getCurrency($store->getBaseCurrencyCode());
+        $currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
         $value = $currency->toCurrency($value, ['display' => \Magento\Framework\Currency::NO_SYMBOL]);
 
         return $value;

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -165,7 +165,7 @@ class Eav extends AbstractModifier
     /**
      * @var CurrencyInterface
      */
-    protected $localeCurrency;
+    private $localeCurrency;
 
     /**
      * @param LocatorInterface $locator
@@ -185,7 +185,6 @@ class Eav extends AbstractModifier
      * @param ArrayManager $arrayManager
      * @param ScopeOverriddenValue $scopeOverriddenValue
      * @param DataPersistorInterface $dataPersistor
-     * @param CurrencyInterface $localeCurrency
      * @param array $attributesToDisable
      * @param array $attributesToEliminate
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -208,7 +207,6 @@ public function __construct(
         ArrayManager $arrayManager,
         ScopeOverriddenValue $scopeOverriddenValue,
         DataPersistorInterface $dataPersistor,
-        CurrencyInterface $localeCurrency,
         $attributesToDisable = [],
         $attributesToEliminate = []
     ) {
@@ -229,7 +227,6 @@ public function __construct(
         $this->arrayManager = $arrayManager;
         $this->scopeOverriddenValue = $scopeOverriddenValue;
         $this->dataPersistor = $dataPersistor;
-        $this->localeCurrency = $localeCurrency;
         $this->attributesToDisable = $attributesToDisable;
         $this->attributesToEliminate = $attributesToEliminate;
     }
@@ -877,6 +874,21 @@ private function calculateGroupCode(AttributeGroupInterface $group)
         return $attributeGroupCode;
     }
 
+    /**
+     * The getter function to get the locale currency for real application code
+     *
+     * @return \Magento\Framework\Locale\CurrencyInterface
+     *
+     * @deprecated
+     */
+    private function getLocaleCurrency()
+    {
+        if ($this->localeCurrency === null) {
+            $this->localeCurrency = \Magento\Framework\App\ObjectManager::getInstance()->get(CurrencyInterface::class);
+        }
+        return $this->localeCurrency;
+    }
+
     /**
      * Format price according to the locale of the currency
      *
@@ -890,7 +902,7 @@ protected function formatPrice($value)
         }
 
         $store = $this->storeManager->getStore();
-        $currency = $this->localeCurrency->getCurrency($store->getBaseCurrencyCode());
+        $currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
         $value = $currency->toCurrency($value, ['display' => \Magento\Framework\Currency::NO_SYMBOL]);
 
         return $value;

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

@@ -30,29 +30,23 @@ class General extends AbstractModifier
     /**
      * @var StoreManagerInterface
      */
-    protected $storeManager;
+    private $storeManager;
 
     /**
      * @var CurrencyInterface
      */
-    protected $localeCurrency;
+    private $localeCurrency;
 
     /**
      * @param LocatorInterface $locator
      * @param ArrayManager $arrayManager
-     * @param StoreManagerInterface $storeManager
-     * @param CurrencyInterface $localeCurrency
      */
     public function __construct(
         LocatorInterface $locator,
-        ArrayManager $arrayManager,
-        StoreManagerInterface $storeManager,
-        CurrencyInterface $localeCurrency
+        ArrayManager $arrayManager
     ) {
         $this->locator = $locator;
         $this->arrayManager = $arrayManager;
-        $this->storeManager = $storeManager;
-        $this->localeCurrency = $localeCurrency;
     }
 
     /**
@@ -369,6 +363,38 @@ protected function customizeNameListeners(array $meta)
         );
     }
 
+    /**
+     * The getter function to get the locale currency for real application code
+     *
+     * @return \Magento\Framework\Locale\CurrencyInterface
+     *
+     * @deprecated
+     */
+    private function getLocaleCurrency()
+    {
+        if ($this->localeCurrency === null) {
+            $this->localeCurrency = \Magento\Framework\App\ObjectManager::getInstance()->get(CurrencyInterface::class);
+        }
+        return $this->localeCurrency;
+    }
+
+    /**
+     * The getter function to get the store manager for real application code
+     *
+     * @return \Magento\Store\Model\StoreManagerInterface
+     *
+     * @deprecated
+     */
+    private function getStoreManager()
+    {
+        if ($this->storeManager === null) {
+            $this->storeManager =
+                \Magento\Framework\App\ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        }
+        return $this->storeManager;
+    }
+
+
     /**
      * Format price according to the locale of the currency
      *
@@ -381,8 +407,8 @@ protected function formatPrice($value)
             return null;
         }
 
-        $store = $this->storeManager->getStore();
-        $currency = $this->localeCurrency->getCurrency($store->getBaseCurrencyCode());
+        $store = $this->getStoreManager()->getStore();
+        $currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
         $value = $currency->toCurrency($value, ['display' => \Magento\Framework\Currency::NO_SYMBOL]);
 
         return $value;
@@ -402,8 +428,8 @@ protected function formatNumber($value)
 
         $value = (float)$value;
         $precision = strlen(substr(strrchr($value, "."), 1));
-        $store = $this->storeManager->getStore();
-        $currency = $this->localeCurrency->getCurrency($store->getBaseCurrencyCode());
+        $store = $this->getStoreManager()->getStore();
+        $currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
         $value = $currency->toCurrency($value, ['display' => \Magento\Framework\Currency::NO_SYMBOL,
                                                 'precision' => $precision]);