MAGETWO-55858: Output escaping methods shouldn't be part of AbstractBlock

Author: Oleksandr Gorkun

app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php

@@ -354,7 +354,15 @@ public function testGetDateFormat(string $locale, string $expectedFormat)
     public function getDateFormatDataProvider(): array
     {
         return [
-            ['ar_SA', 'd/M/y'],
+            [
+                'ar_SA',
+                preg_replace(
+                    '/[^MmDdYy\/\.\-]/',
+                    '',
+                    (new \IntlDateFormatter('ar_SA', \IntlDateFormatter::SHORT, \IntlDateFormatter::NONE))
+                        ->getPattern()
+                )
+            ],
             [Resolver::DEFAULT_LOCALE, self::DATE_FORMAT],
         ];
     }

lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php

@@ -135,8 +135,11 @@ public function testGetHashRandomSaltSpecifiedLength(): void
      *
      * @dataProvider validateHashDataProvider
      */
-    public function testValidateHash($password, $hash, $expected): void
+    public function testValidateHash($password, $hash, $expected, int $requiresVersion): void
     {
+        if ($requiresVersion > $this->encryptor->getLatestHashVersion()) {
+            $this->markTestSkipped('On current installation encryptor does not support algo #' .$requiresVersion);
+        }
         $actual = $this->encryptor->validateHash($password, $hash);
         $this->assertEquals($expected, $actual);
     }
@@ -149,10 +152,14 @@ public function testValidateHash($password, $hash, $expected): void
     public function validateHashDataProvider(): array
     {
         return [
-            ['password', 'hash:salt:1', false],
-            ['password', '67a1e09bb1f83f5007dc119c14d663aa:salt:0', true],
-            ['password', '13601bda4ea78e55a07b98866d2be6be0744e3866f13c00c811cab608a28f322:salt:1', true],
-            ['password', 'c6aad9e058f6c4b06187c06d2b69bf506a786af030f81fb6d83778422a68205e:salt:1:2', true],
+            ['password', 'hash:salt:1', false, 1],
+            ['password', '67a1e09bb1f83f5007dc119c14d663aa:salt:0', true, 0],
+            ['password', '13601bda4ea78e55a07b98866d2be6be0744e3866f13c00c811cab608a28f322:salt:1', true, 1],
+            //Hashes after customer:hash:upgrade command issued
+            //Upgraded from version #1 to #2
+            ['password', 'c6aad9e058f6c4b06187c06d2b69bf506a786af030f81fb6d83778422a68205e:salt:1:2', true, 2],
+            //From #0 to #1
+            ['password', '3b68ca4706cbae291455e4340478076c1e1618e742b6144cfcc3e50f648903e4:salt:0:1', true, 1]
         ];
     }
 

lib/internal/Magento/Framework/Locale/Test/Unit/TranslatedListsTest.php

@@ -44,24 +44,36 @@ class TranslatedListsTest extends TestCase
      * @var array
      */
     private $expectedLocales = [
-        'en_US' => 'English (United States)',
-        'en_GB' => 'English (United Kingdom)',
-        'uk_UA' => 'Ukrainian (Ukraine)',
-        'de_DE' => 'German (Germany)',
-        'sr_Cyrl_RS' => 'Serbian (Cyrillic, Serbia)',
-        'sr_Latn_RS' => 'Serbian (Latin, Serbia)'
+        'en_US',
+        'en_GB',
+        'uk_UA',
+        'de_DE',
+        'sr_Cyrl_RS',
+        'sr_Latn_RS'
     ];
 
     /**
-     * @var array
+     * @var string[]
+     */
+    private $languages = [
+        'en_US' => 'English',
+        'en_GB' => 'English',
+        'uk_UA' => 'Ukrainian',
+        'de_DE' => 'German',
+        'sr_Cyrl_RS' => 'Serbian',
+        'sr_Latn_RS' => 'Serbian'
+    ];
+
+    /**
+     * @var string[]
      */
-    private $expectedTranslatedLocales = [
-        'en_US' => 'English (United States) / English (United States)',
-        'en_GB' => 'English (United Kingdom) / English (United Kingdom)',
-        'uk_UA' => 'українська (Україна) / Ukrainian (Ukraine)',
-        'de_DE' => 'Deutsch (Deutschland) / German (Germany)',
-        'sr_Cyrl_RS' => 'српски (ћирилица, Србија) / Serbian (Cyrillic, Serbia)',
-        'sr_Latn_RS' => 'Srpski (latinica, Srbija) / Serbian (Latin, Serbia)'
+    private $countries = [
+        'en_US' => 'United States',
+        'en_GB' => 'United Kingdom',
+        'uk_UA' => 'Ukraine',
+        'de_DE' => 'Germany',
+        'sr_Cyrl_RS' => 'Serbia',
+        'sr_Latn_RS' => 'Serbia'
     ];
 
     protected function setUp()
@@ -168,20 +180,22 @@ public function testGetOptionTimezones()
 
     public function testGetOptionLocales()
     {
+        $expected = $this->getExpectedLocales();
         $locales = array_intersect(
-            $this->expectedLocales,
+            $expected,
             $this->convertOptionLocales($this->listsModel->getOptionLocales())
         );
-        $this->assertEquals($this->expectedLocales, $locales);
+        $this->assertEquals($expected, $locales);
     }
 
     public function testGetTranslatedOptionLocales()
     {
+        $expected = $this->getExpectedTranslatedLocales();
         $locales = array_intersect(
-            $this->expectedTranslatedLocales,
+            $expected,
             $this->convertOptionLocales($this->listsModel->getTranslatedOptionLocales())
         );
-        $this->assertEquals($this->expectedTranslatedLocales, $locales);
+        $this->assertEquals($expected, $locales);
     }
 
     /**
@@ -198,4 +212,42 @@ private function convertOptionLocales($optionLocales): array
 
         return $result;
     }
+
+    /**
+     * Expected translated locales list.
+     *
+     * @return string[]
+     */
+    private function getExpectedTranslatedLocales(): array
+    {
+        $expected = [];
+        foreach ($this->expectedLocales as $locale) {
+            $script = \Locale::getDisplayScript($locale);
+            $scriptTranslated = $script ? \Locale::getDisplayScript($locale, $locale) .', ' : '';
+            $expected[$locale] = ucwords(\Locale::getDisplayLanguage($locale, $locale))
+                . ' (' . $scriptTranslated
+                . \Locale::getDisplayRegion($locale, $locale) . ') / '
+                . $this->languages[$locale]
+                . ' (' . ($script ? $script .', ' : '') . $this->countries[$locale] . ')';
+        }
+
+        return $expected;
+    }
+
+    /**
+     * Expected locales list.
+     *
+     * @return string[]
+     */
+    private function getExpectedLocales(): array
+    {
+        $expected = [];
+        foreach ($this->expectedLocales as $locale) {
+            $script = \Locale::getScript($locale);
+            $scriptDisplayed = $script ? \Locale::getDisplayScript($locale) . ', ' : '';
+            $expected[$locale] = $this->languages[$locale] .' (' .$scriptDisplayed .$this->countries[$locale] .')';
+        }
+
+        return $expected;
+    }
 }