Code drop from //branches/cupcake/...@124589

2 files changed, 13 insertions, 9 deletions

diff --git a/tests/src/com/android/calendar/FormatDateRangeTest.java b/tests/src/com/android/calendar/FormatDateRangeTest.java
index a1cb2b70..7b34ac4e 100644
--- a/tests/src/com/android/calendar/FormatDateRangeTest.java
+++ b/tests/src/com/android/calendar/FormatDateRangeTest.java
@@ -17,14 +17,15 @@
 package com.android.calendar;
 
 import android.content.res.Resources;
-import android.pim.DateUtils;
-import android.pim.Time;
+import android.text.format.DateUtils;
+import android.text.format.Time;
 import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
 
 
 /**
- * Unit tests for {@link android.pim.DateUtils#formatDateRange}.
+ * Unit tests for {@link android.text.format.DateUtils#formatDateRange}.
  */
 public class FormatDateRangeTest extends AndroidTestCase {
 
@@ -158,6 +159,7 @@ public class FormatDateRangeTest extends AndroidTestCase {
         mResources = mContext.getResources();
     }
 
+    @MediumTest
     public void testAll() throws Exception {
         int len = tests.length;
         for (int index = 0; index < len; index++) {
@@ -165,7 +167,7 @@ public class FormatDateRangeTest extends AndroidTestCase {
             long startMillis = dateRange.date1.toMillis(false /* use isDst */);
             long endMillis = dateRange.date2.toMillis(false /* use isDst */);
             int flags = dateRange.flags;
-            String output = DateUtils.formatDateRange(startMillis, endMillis, flags);
+            String output = DateUtils.formatDateRange(mContext, startMillis, endMillis, flags);
             if (!dateRange.expectedOutput.equals(output)) {
                 Log.i("FormatDateRangeTest", "index " + index
                         + " expected: " + dateRange.expectedOutput
diff --git a/tests/src/com/android/calendar/WeekNumberTest.java b/tests/src/com/android/calendar/WeekNumberTest.java
index c7af8730..6b3774b7 100644
--- a/tests/src/com/android/calendar/WeekNumberTest.java
+++ b/tests/src/com/android/calendar/WeekNumberTest.java
@@ -17,14 +17,15 @@
 package com.android.calendar;
 
 import android.content.res.Resources;
-import android.pim.DateUtils;
-import android.pim.Time;
+import android.text.format.DateUtils;
+import android.text.format.Time;
 import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 
 
 /**
- * Unit tests for {@link android.pim.Time#getWeekNumber}.
+ * Unit tests for {@link android.text.format.Time#getWeekNumber}.
  */
 public class WeekNumberTest extends AndroidTestCase {
 
@@ -199,6 +200,7 @@ public class WeekNumberTest extends AndroidTestCase {
         super.setUp();
     }
 
+    @SmallTest
     public void testAll() throws Exception {
         int len = tests.length;
         for (int index = 0; index < len; index++) {
@@ -207,7 +209,7 @@ public class WeekNumberTest extends AndroidTestCase {
             if (weekNumber != test.expectedWeekNumber) {
                 long millis = test.date.toMillis(false /* use isDst */);
                 int flags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NUMERIC_DATE;
-                String output = DateUtils.formatDateRange(millis, millis, flags);
+                String output = DateUtils.formatDateTime(mContext, millis, flags);
                 Log.i("WeekNumberTest", "index " + index
                         + " date: " + output
                         + " expected: " + test.expectedWeekNumber
@@ -219,7 +221,7 @@ public class WeekNumberTest extends AndroidTestCase {
             if (weekNumber != test.expectedWeekNumber) {
                 long millis = test.date.toMillis(false /* use isDst */);
                 int flags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NUMERIC_DATE;
-                String output = DateUtils.formatDateRange(millis, millis, flags);
+                String output = DateUtils.formatDateTime(mContext, millis, flags);
                 Log.i("WeekNumberTest", "(all-day) index " + index
                         + " date: " + output
                         + " expected: " + test.expectedWeekNumber