Merge remote-tracking branch 'origin/ACP2E-428' into L3_Arrows_PR_20220314

Author: nishant04412

app/code/Magento/DirectoryGraphQl/Model/Resolver/Countries.php

@@ -55,7 +55,9 @@ public function resolve(
 
         $output = [];
         foreach ($countries as $country) {
-            $output[] = $this->dataProcessor->buildOutputDataArray($country, CountryInformationInterface::class);
+            if (!empty($country->getFullNameLocale())) {
+                $output[] = $this->dataProcessor->buildOutputDataArray($country, CountryInformationInterface::class);
+            }
         }
 
         return $output;

dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CountriesTest.php

@@ -42,4 +42,30 @@ public function testGetCountries()
         $this->assertArrayHasKey('full_name_english', $result['countries'][0]);
         $this->assertArrayHasKey('available_regions', $result['countries'][0]);
     }
+
+    public function testCheckCountriesForNullLocale()
+    {
+        $query = <<<QUERY
+query {
+    countries {
+        id
+        two_letter_abbreviation
+        three_letter_abbreviation
+        full_name_locale
+        full_name_english
+        available_regions {
+            id
+            code
+            name
+        }
+    }
+}
+QUERY;
+
+        $result = $this->graphQlQuery($query);
+        $count = count($result['countries']);
+        for ($i=0; $i < $count; $i++) {
+            $this->assertNotNull($result['countries'][$i]['full_name_locale']);
+        }
+    }
 }