[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 58 am: fc5a01ba3d -s ours am: 8eb668d374 -s ours am: 3f055f5bde -s ours
am: f6644e9bc0 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia6514e20b707eea418e0eb0b890eacbbf94ba252
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/format/DataDrivenFormatTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/format/DataDrivenFormatTest.java
index 5789e75..2755bcc 100644
--- a/android_icu4j/src/main/tests/android/icu/dev/test/format/DataDrivenFormatTest.java
+++ b/android_icu4j/src/main/tests/android/icu/dev/test/format/DataDrivenFormatTest.java
@@ -29,7 +29,6 @@
import android.icu.text.DateFormat;
import android.icu.text.SimpleDateFormat;
import android.icu.util.Calendar;
-import android.icu.util.JapaneseCalendar;
import android.icu.util.TimeZone;
import android.icu.util.ULocale;
@@ -101,14 +100,6 @@
String spec = currentCase.getString("spec");
String date = currentCase.getString("date");
String str = currentCase.getString("str");
-
- // Android-changed: Old Android releases can optionally support the new Japanese era.
- // Note that the value of CURRENT_ERA comes from the system image, the string "Reiwa"
- // comes from test side binary resource file.
- if (JapaneseCalendar.CURRENT_ERA == JapaneseCalendar.HEISEI
- && "TestConsistentPivot".equals(testData.getName())) {
- str = str.replace("Reiwa", "Heisei");
- }
Date fromDate = null;
boolean useDate = false;
diff --git a/icu4c/source/test/intltest/incaltst.cpp b/icu4c/source/test/intltest/incaltst.cpp
index bd3d911..d584e49 100644
--- a/icu4c/source/test/intltest/incaltst.cpp
+++ b/icu4c/source/test/intltest/incaltst.cpp
@@ -712,7 +712,7 @@
}
delete fmt;
}
- }
+ }
delete cal2;
delete cal;
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java
index 60b40a2..91cf2ee 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java
@@ -28,7 +28,6 @@
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.SimpleDateFormat;
import com.ibm.icu.util.Calendar;
-import com.ibm.icu.util.JapaneseCalendar;
import com.ibm.icu.util.TimeZone;
import com.ibm.icu.util.ULocale;
@@ -98,14 +97,6 @@
String spec = currentCase.getString("spec");
String date = currentCase.getString("date");
String str = currentCase.getString("str");
-
- // Android-changed: Old Android releases can optionally support the new Japanese era.
- // Note that the value of CURRENT_ERA comes from the system image, the string "Reiwa"
- // comes from test side binary resource file.
- if (JapaneseCalendar.CURRENT_ERA == JapaneseCalendar.HEISEI
- && "TestConsistentPivot".equals(testData.getName())) {
- str = str.replace("Reiwa", "Heisei");
- }
Date fromDate = null;
boolean useDate = false;