commit e2b9fcda586f9a9b7ebd6e947f2f23a2af9760f0
author Nikita Iashchenko <nikitai@google.com> Thu Apr 25 11:09:32 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 25 11:09:32 2019 +0000
tree 4b3977138f5487419c69796500fb3379d0caaaa3
parent f6840f27f4fa8f758143f1bb8f0cc1c1b289988d
parent f7e9b4bca83b7d82fdf1c1e794163b4fc9dd4a1e

Merge "New Japanese Era implementation with actual Reiwa name (part 2)"

ojluni/src/test/java/time/test/java/time/format/TestNonIsoFormatter.java

diff --git a/ojluni/src/test/java/time/test/java/time/format/TestNonIsoFormatter.java b/ojluni/src/test/java/time/test/java/time/format/TestNonIsoFormatter.java
index e2c2b4a..310f008 100644
--- a/ojluni/src/test/java/time/test/java/time/format/TestNonIsoFormatter.java
+++ b/ojluni/src/test/java/time/test/java/time/format/TestNonIsoFormatter.java
@@ -149,9 +149,8 @@
             { JAPANESE, "Meiji 123", "Heisei 2" },
             // Android-changed: Eras names have been changed in CLDR data.
             // { JAPANESE, "Showa 65", "Heisei 2" }
-            // { JAPANESE, "Heisei 32", "NewEra 2" }, // NewEra
             { JAPANESE, "Shōwa 65", "Heisei 2" },
-            { JAPANESE, "Heisei 32", "Qqqq 2" }, // NewEra
+            { JAPANESE, "Heisei 32", "Reiwa 2" },
         };
     }