am cf8de265: Merge "Teach the DateFormat test that we\'ve deliberately broken \'k\'."
* commit 'cf8de26532f0ac5d4322e0adf0a749b2b5e5b979':
Teach the DateFormat test that we've deliberately broken 'k'.
diff --git a/tests/tests/text/src/android/text/format/cts/DateFormatTest.java b/tests/tests/text/src/android/text/format/cts/DateFormatTest.java
index 9a291e0..9d739d3 100644
--- a/tests/tests/text/src/android/text/format/cts/DateFormatTest.java
+++ b/tests/tests/text/src/android/text/format/cts/DateFormatTest.java
@@ -197,7 +197,13 @@
SimpleDateFormat sdf = new SimpleDateFormat(pattern);
sdf.setTimeZone(utc);
- assertEquals(expected, DateFormat.format(pattern, c));
+ if (pattern.equals("k") && (hour == 0 || hour == 24)) {
+ // http://b/8359981: 'k' has always been broken on Android, and we keep it broken
+ // for compatibility. Maybe one day we'll be able to fix this...
+ assertEquals("0", DateFormat.format(pattern, c));
+ } else {
+ assertEquals(expected, DateFormat.format(pattern, c));
+ }
assertEquals(expected, sdf.format(c.getTime()));
}