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

@@ -11,8 +11,6 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
- * Class Store Address Collection
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class StoreAddressCollection extends Collection

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

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