Merge remote-tracking branch 'origin/MC-38476' into MC-38663

Author: yelahin-serhiy

app/code/Magento/Directory/etc/zip_codes.xml

@@ -19,6 +19,7 @@
     <zip countryCode="AR">
         <codes>
             <code id="pattern_1" active="true" example="1234">^[0-9]{4}$</code>
+            <code id="pattern_2" active="true" example="A1234BCD">^[a-zA-z]{1}[0-9]{4}[a-zA-z]{3}$</code>
         </codes>
     </zip>
     <zip countryCode="AM">

dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/Config/ReaderTest.php

@@ -6,18 +6,20 @@
 
 namespace Magento\Directory\Model\Country\Postcode\Config;
 
-class ReaderTest extends \PHPUnit\Framework\TestCase
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class ReaderTest extends TestCase
 {
     /**
-     * @var \Magento\Directory\Model\Country\Postcode\Config\Reader
+     * @var Reader
      */
     private $reader;
 
     protected function setUp(): void
     {
-        $this->reader = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Directory\Model\Country\Postcode\Config\Reader::class
-        );
+        $this->reader = Bootstrap::getObjectManager()
+            ->create(Reader::class);
     }
 
     public function testRead()
@@ -39,5 +41,13 @@ public function testRead()
 
         $this->assertEquals('test1', $result['NL_NEW']['pattern_1']['example']);
         $this->assertEquals('^[0-2]{4}[A-Z]{2}$', $result['NL_NEW']['pattern_1']['pattern']);
+
+        $this->assertArrayHasKey('AR', $result);
+        $this->assertArrayHasKey('pattern_1', $result['AR']);
+        $this->assertArrayHasKey('pattern_2', $result['AR']);
+        $this->assertEquals('1234', $result['AR']['pattern_1']['example']);
+        $this->assertEquals('^[0-9]{4}$', $result['AR']['pattern_1']['pattern']);
+        $this->assertEquals('A1234BCD', $result['AR']['pattern_2']['example']);
+        $this->assertEquals('^[a-zA-z]{1}[0-9]{4}[a-zA-z]{3}$', $result['AR']['pattern_2']['pattern']);
     }
 }