MC-33168: Default State dropdown is not filled with correct data

Author: yelahin-serhiy

app/code/Magento/Directory/Test/Unit/Helper/DataTest.php

@@ -7,64 +7,78 @@
 
 use Magento\Directory\Helper\Data;
 use Magento\Directory\Model\AllowedCountries;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Directory\Model\ResourceModel\Country\Collection as CountryCollection;
+use Magento\Directory\Model\ResourceModel\Region\Collection as RegionCollection;
+use Magento\Directory\Model\ResourceModel\Region\CollectionFactory;
+use Magento\Framework\App\Cache\Type\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Helper\Context;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Json\Helper\Data as JsonDataHelper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\Constraint\IsIdentical;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class DataTest extends \PHPUnit\Framework\TestCase
+class DataTest extends TestCase
 {
     /**
-     * @var \Magento\Directory\Model\ResourceModel\Country\Collection|\PHPUnit_Framework_MockObject_MockObject
+     * @var CountryCollection|MockObject
      */
     protected $_countryCollection;
 
     /**
-     * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionFactory|MockObject
      */
     protected $_regionCollection;
 
     /**
-     * @var \Magento\Framework\Json\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var JsonDataHelper|MockObject
      */
     protected $jsonHelperMock;
 
     /**
-     * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject
+     * @var Store|MockObject
      */
     protected $_store;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|MockObject
      */
     protected $scopeConfigMock;
 
     /**
-     * @var \Magento\Directory\Helper\Data
+     * @var Data
      */
     protected $_object;
 
     protected function setUp()
     {
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $objectManager = new ObjectManager($this);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $this->scopeConfigMock->expects($this->any())->method('isSetFlag')->willReturn(false);
         $requestMock = $this->createMock(RequestInterface::class);
-        $context = $this->createMock(\Magento\Framework\App\Helper\Context::class);
+        $context = $this->createMock(Context::class);
         $context->method('getRequest')
             ->willReturn($requestMock);
         $context->expects($this->any())
             ->method('getScopeConfig')
             ->willReturn($this->scopeConfigMock);
-        $configCacheType = $this->createMock(\Magento\Framework\App\Cache\Type\Config::class);
+        $configCacheType = $this->createMock(Config::class);
 
-        $this->_countryCollection = $this->createMock(\Magento\Directory\Model\ResourceModel\Country\Collection::class);
+        $this->_countryCollection = $this->createMock(CountryCollection::class);
 
-        $this->_regionCollection = $this->createMock(\Magento\Directory\Model\ResourceModel\Region\Collection::class);
+        $this->_regionCollection = $this->createMock(RegionCollection::class);
         $regCollectionFactory = $this->createPartialMock(
-            \Magento\Directory\Model\ResourceModel\Region\CollectionFactory::class,
+            CollectionFactory::class,
             ['create']
         );
         $regCollectionFactory->expects(
@@ -75,13 +89,13 @@ protected function setUp()
             $this->returnValue($this->_regionCollection)
         );
 
-        $this->jsonHelperMock = $this->createMock(\Magento\Framework\Json\Helper\Data::class);
+        $this->jsonHelperMock = $this->createMock(JsonDataHelper::class);
 
-        $this->_store = $this->createMock(\Magento\Store\Model\Store::class);
-        $storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->_store = $this->createMock(Store::class);
+        $storeManager = $this->createMock(StoreManagerInterface::class);
         $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->_store));
 
-        $currencyFactory = $this->createMock(\Magento\Directory\Model\CurrencyFactory::class);
+        $currencyFactory = $this->createMock(CurrencyFactory::class);
 
         $arguments = [
             'context' => $context,
@@ -92,7 +106,7 @@ protected function setUp()
             'storeManager' => $storeManager,
             'currencyFactory' => $currencyFactory,
         ];
-        $this->_object = $objectManager->getObject(\Magento\Directory\Helper\Data::class, $arguments);
+        $this->_object = $objectManager->getObject(Data::class, $arguments);
     }
 
     public function testGetRegionJson()
@@ -110,13 +124,13 @@ public function testGetRegionJson()
                 ]
             );
         $regions = [
-            new \Magento\Framework\DataObject(
+            new DataObject(
                 ['country_id' => 'Country1', 'region_id' => 'r1', 'code' => 'r1-code', 'name' => 'r1-name']
             ),
-            new \Magento\Framework\DataObject(
+            new DataObject(
                 ['country_id' => 'Country1', 'region_id' => 'r2', 'code' => 'r2-code', 'name' => 'r2-name']
             ),
-            new \Magento\Framework\DataObject(
+            new DataObject(
                 ['country_id' => 'Country2', 'region_id' => 'r3', 'code' => 'r3-code', 'name' => 'r3-name']
             )
         ];
@@ -153,7 +167,7 @@ public function testGetRegionJson()
         )->method(
             'jsonEncode'
         )->with(
-            new \PHPUnit\Framework\Constraint\IsIdentical($expectedDataToEncode)
+            new IsIdentical($expectedDataToEncode)
         )->will(
             $this->returnValue('encoded_json')
         );
@@ -225,7 +239,7 @@ public function testGetDefaultCountry()
             ->method('getValue')
             ->with(
                 Data::XML_PATH_DEFAULT_COUNTRY,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ScopeInterface::SCOPE_STORE,
                 $storeId
             )->will($this->returnValue($country));
 
@@ -242,7 +256,7 @@ public function testGetCountryCollection()
             $this->returnValue(0)
         );
 
-        $store = $this->createMock(\Magento\Store\Model\Store::class);
+        $store = $this->createMock(Store::class);
         $this->_countryCollection->expects(
             $this->once()
         )->method(
@@ -262,7 +276,7 @@ public function testGetCountryCollection()
     public function testGetTopCountryCodesReturnsParsedConfigurationValue($topCountriesValue, $expectedResult)
     {
         $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')->with(\Magento\Directory\Helper\Data::XML_PATH_TOP_COUNTRIES)
+            ->method('getValue')->with(Data::XML_PATH_TOP_COUNTRIES)
             ->willReturn($topCountriesValue);
 
         $this->assertEquals($expectedResult, $this->_object->getTopCountryCodes());