Fix DateUtilsTest that are dependent on current year.
Bug 2362120
Change-Id: Ic3b447f5dc6a433b5b122642902eeda239c146dc
diff --git a/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java b/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
index 6e414dd..22ef413 100644
--- a/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
+++ b/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
@@ -207,6 +207,11 @@
Date date = new Date(109, 0, 19, 3, 30, 15);
long fixedTime = date.getTime();
+
+ int currentYear = Calendar.getInstance().get(Calendar.YEAR);
+ Date dateWithCurrentYear = new Date(currentYear - 1900, 0, 19, 3, 30, 15);
+ long timeWithCurrentYear = dateWithCurrentYear.getTime();
+
assertEquals("Saturday, January 24, 2009", DateUtils.formatSameDayTime(
fixedTime + DAY_DURATION, fixedTime, java.text.DateFormat.FULL,
java.text.DateFormat.FULL).toString());
@@ -235,16 +240,16 @@
long integralDuration = 30 * 60 * 1000 + 15 * 1000;
assertEquals("Monday", DateUtils.formatDateRange(mContext, fixedTime, fixedTime
+ HOUR_DURATION, DateUtils.FORMAT_SHOW_WEEKDAY));
- assertEquals("January 19", DateUtils.formatDateRange(mContext, fixedTime,
- fixedTime + HOUR_DURATION, DateUtils.FORMAT_SHOW_DATE));
+ assertEquals("January 19", DateUtils.formatDateRange(mContext, timeWithCurrentYear,
+ timeWithCurrentYear + HOUR_DURATION, DateUtils.FORMAT_SHOW_DATE));
assertEquals("3:30am", DateUtils.formatDateRange(mContext, fixedTime, fixedTime,
DateUtils.FORMAT_SHOW_TIME));
assertEquals("January 19, 2009", DateUtils.formatDateRange(mContext, fixedTime,
fixedTime + HOUR_DURATION, DateUtils.FORMAT_SHOW_YEAR));
- assertEquals("January 19", DateUtils.formatDateRange(mContext, fixedTime,
- fixedTime + HOUR_DURATION, DateUtils.FORMAT_NO_YEAR));
- assertEquals("January", DateUtils.formatDateRange(mContext, fixedTime,
- fixedTime + HOUR_DURATION, DateUtils.FORMAT_NO_MONTH_DAY));
+ assertEquals("January 19", DateUtils.formatDateRange(mContext, timeWithCurrentYear,
+ timeWithCurrentYear + HOUR_DURATION, DateUtils.FORMAT_NO_YEAR));
+ assertEquals("January", DateUtils.formatDateRange(mContext, timeWithCurrentYear,
+ timeWithCurrentYear + HOUR_DURATION, DateUtils.FORMAT_NO_MONTH_DAY));
assertEquals("3:30am", DateUtils.formatDateRange(mContext, fixedTime, fixedTime,
DateUtils.FORMAT_12HOUR | DateUtils.FORMAT_SHOW_TIME));
assertEquals("03:30", DateUtils.formatDateRange(mContext, fixedTime, fixedTime,
@@ -271,59 +276,17 @@
assertEquals("Mon", DateUtils.formatDateRange(mContext, fixedTime,
fixedTime + HOUR_DURATION,
DateUtils.FORMAT_SHOW_WEEKDAY | DateUtils.FORMAT_ABBREV_WEEKDAY));
- assertEquals("Jan 19", DateUtils.formatDateRange(mContext, fixedTime,
- fixedTime + HOUR_DURATION,
+ assertEquals("Jan 19", DateUtils.formatDateRange(mContext, timeWithCurrentYear,
+ timeWithCurrentYear + HOUR_DURATION,
DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_ABBREV_MONTH));
- assertEquals("Jan 19", DateUtils.formatDateRange(mContext, fixedTime,
- fixedTime + HOUR_DURATION,
+ assertEquals("Jan 19", DateUtils.formatDateRange(mContext, timeWithCurrentYear,
+ timeWithCurrentYear + HOUR_DURATION,
DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_ABBREV_ALL));
String actual = DateUtils.formatDateRange(mContext, fixedTime,
fixedTime + HOUR_DURATION,
DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_NUMERIC_DATE);
// accept with leading zero or without
assertTrue("1/19/2009".equals(actual) || "01/19/2009".equals(actual));
-
- assertEquals("Monday", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_SHOW_WEEKDAY));
- assertEquals("January 19", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_SHOW_DATE));
- assertEquals("3:30am", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_SHOW_TIME));
- assertEquals("January 19, 2009", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_SHOW_YEAR));
- assertEquals("January 19", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_NO_YEAR));
- assertEquals("January", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_NO_MONTH_DAY));
- assertEquals("3:30am", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_12HOUR | DateUtils.FORMAT_SHOW_TIME));
- assertEquals("03:30", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_24HOUR | DateUtils.FORMAT_SHOW_TIME));
- assertEquals("3:30AM", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_12HOUR | DateUtils.FORMAT_CAP_AMPM | DateUtils.FORMAT_SHOW_TIME));
- assertEquals("noon", DateUtils.formatDateTime(mContext, fixedTime + noonDuration,
- DateUtils.FORMAT_12HOUR | DateUtils.FORMAT_SHOW_TIME));
- assertEquals("Noon", DateUtils.formatDateTime(mContext, fixedTime + noonDuration,
- DateUtils.FORMAT_12HOUR | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_CAP_NOON));
- assertEquals("12:00pm", DateUtils.formatDateTime(mContext, fixedTime + noonDuration,
- DateUtils.FORMAT_12HOUR | DateUtils.FORMAT_NO_NOON | DateUtils.FORMAT_SHOW_TIME));
- assertEquals("12:00am", DateUtils.formatDateTime(mContext, fixedTime - midnightDuration,
- DateUtils.FORMAT_12HOUR | DateUtils.FORMAT_SHOW_TIME
- | DateUtils.FORMAT_NO_MIDNIGHT));
- assertEquals("3:30am", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_UTC));
- assertEquals("3am", DateUtils.formatDateTime(mContext, fixedTime - integralDuration,
- DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_ABBREV_TIME));
- assertEquals("Mon", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_SHOW_WEEKDAY | DateUtils.FORMAT_ABBREV_WEEKDAY));
- assertEquals("Jan 19", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_ABBREV_MONTH));
- assertEquals("Jan 19", DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_ABBREV_ALL));
- actual = DateUtils.formatDateTime(mContext, fixedTime,
- DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_NUMERIC_DATE);
- // accept with leading zero or without
- assertTrue("1/19/2009".equals(actual) || "01/19/2009".equals(actual));
}
@TestTargetNew(
