MC-42623:Countries list is incorrect when using different countries per website and Global Customer Account settings - Integration test coverage implemented

Author: pradeep.rauthan

app/code/Magento/Customer/Model/ResourceModel/Address/StoreAddressCollection.php

@@ -6,7 +6,6 @@
 namespace Magento\Customer\Model\ResourceModel\Address;
 
 use Magento\Directory\Model\AllowedCountries;
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Sales\Block\Adminhtml\Order\Create\Form\Address as AddressBlock;
 use Magento\Store\Model\ScopeInterface;
 
@@ -15,13 +14,6 @@
  */
 class StoreAddressCollection extends Collection
 {
-    /**
-     * Object Manager instance
-     *
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
     /**
      * @var AddressBlock
      */
@@ -43,7 +35,8 @@ class StoreAddressCollection extends Collection
      * @param \Magento\Eav\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
-     * @param ObjectManagerInterface $objectManager
+     * @param AddressBlock $addressBlock
+     * @param AllowedCountries $allowedCountryReader
      * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -59,10 +52,12 @@ public function __construct(
         \Magento\Eav\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot,
-        ObjectManagerInterface $objectManager,
+        AddressBlock $addressBlock,
+        AllowedCountries $allowedCountryReader,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null
     ) {
-        $this->objectManager = $objectManager;
+        $this->addressBlock = $addressBlock;
+        $this->allowedCountryReader = $allowedCountryReader;
 
         parent::__construct(
             $entityFactory,
@@ -79,19 +74,6 @@ public function __construct(
         );
     }
 
-    /**
-     * Resource initialization
-     *
-     * @return void
-     */
-    public function _construct()
-    {
-        parent::_construct();
-
-        $this->addressBlock = $this->objectManager->create(AddressBlock::class);
-        $this->allowedCountryReader = $this->objectManager->create(AllowedCountries::class);
-    }
-
     /**
      * Set allowed country filter for customer's addresses
      *

dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Address/StoreAddressCollectionTest.php

@@ -32,7 +32,9 @@ public function testSetCustomerFilter()
         $storeId = $customer->getStoreId();
         $allowedCountries = $allowedCountriesObj->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
         $strAllowedCountries = implode("%S, %S", $allowedCountries);
-        $format = '%AWHERE%S(%Sparent_id%S IN(%S1%S, %S2%S))%SAND%S(%Sparent_id%S = %S-1%S)' .
+        $format = '%AWHERE' .
+            '%S(%Sparent_id%S IN(%S1%S, %S2%S))%SAND%S(%Scountry_id%S IN(%S' . $strAllowedCountries . '%S))' .
+            '%SAND%S(%Sparent_id%S = %S-1%S)%SAND%S(%Scountry_id%S IN(%S' . $strAllowedCountries . '%S))' .
             '%SAND%S(%Sparent_id%S = %S3%S)%SAND%S(%Scountry_id%S IN(%S' . $strAllowedCountries . '%S))%A';
         $this->assertStringMatchesFormat($format, (string)$select);
     }