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

Author: pradeep.rauthan

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

@@ -29,9 +29,14 @@ public function testSetCustomerFilter()
         $allowedCountriesObj = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Directory\Model\AllowedCountries::class
         );
-        $storeId = $customer->getStoreId();
-        $allowedCountries = $allowedCountriesObj->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
-        $strAllowedCountries = implode("%S, %S", $allowedCountries);
-        $this->assertStringMatchesFormat('%AWHERE%S(%Scountry_id%S IN(%S' . $strAllowedCountries . '%S))%A', (string)$select);
+        $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)%A';
+        $storeId = $customer->getStoreId() ?? null;
+        if ($storeId) {
+            $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)' .
+                '%SAND%S(%Sparent_id%S = %S3%S)%SAND%S(%Scountry_id%S IN(%S' . $strAllowedCountries . '%S))%A';
+        }
+        $this->assertStringMatchesFormat($format, (string)$select);
     }
 }