summaryrefslogtreecommitdiffstats
path: root/luni/src/test
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-10-23 19:11:21 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-10-23 19:11:21 +0000
commitd2ad744e930a855fbfa63e3f31f31bc391c37a50 (patch)
tree431fd2292b314eb1f63431a3d15b112c7b4f7c7f /luni/src/test
parent026194b8948b75b70fe035e3008cd5288e62badb (diff)
parent4349006f90740fe9b2fcb5b717d9c94fb8a9f296 (diff)
downloadlibcore-d2ad744e930a855fbfa63e3f31f31bc391c37a50.zip
libcore-d2ad744e930a855fbfa63e3f31f31bc391c37a50.tar.gz
libcore-d2ad744e930a855fbfa63e3f31f31bc391c37a50.tar.bz2
Merge "Fix LocaleDataTest build breakage."
Diffstat (limited to 'luni/src/test')
-rw-r--r--luni/src/test/java/libcore/icu/LocaleDataTest.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/luni/src/test/java/libcore/icu/LocaleDataTest.java b/luni/src/test/java/libcore/icu/LocaleDataTest.java
index 0a83c53..9ad6687 100644
--- a/luni/src/test/java/libcore/icu/LocaleDataTest.java
+++ b/luni/src/test/java/libcore/icu/LocaleDataTest.java
@@ -24,7 +24,7 @@ public class LocaleDataTest extends junit.framework.TestCase {
for (Locale l : Locale.getAvailableLocales()) {
LocaleData d = LocaleData.get(l);
// System.err.format("%20s %s %s %s\n", l, d.yesterday, d.today, d.tomorrow);
- // System.err.format("%20s %10s %10s\n", l, d.timeFormat12, d.timeFormat24);
+ // System.err.format("%20s %10s %10s\n", l, d.timeFormat_hm, d.timeFormat_Hm);
}
}
@@ -124,11 +124,11 @@ public class LocaleDataTest extends junit.framework.TestCase {
// http://b/7924970
public void testTimeFormat12And24() throws Exception {
LocaleData en_US = LocaleData.get(Locale.US);
- assertEquals("h:mm a", en_US.timeFormat12);
- assertEquals("HH:mm", en_US.timeFormat24);
+ assertEquals("h:mm a", en_US.timeFormat_hm);
+ assertEquals("HH:mm", en_US.timeFormat_Hm);
LocaleData ja_JP = LocaleData.get(Locale.JAPAN);
- assertEquals("aK:mm", ja_JP.timeFormat12);
- assertEquals("H:mm", ja_JP.timeFormat24);
+ assertEquals("aK:mm", ja_JP.timeFormat_hm);
+ assertEquals("H:mm", ja_JP.timeFormat_Hm);
}
}