summaryrefslogtreecommitdiffstats
path: root/tests/src/com
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2011-04-14 09:28:08 -0700
committerAndy McFadden <fadden@android.com>2011-04-14 16:04:43 -0700
commitae5bcce4a24c1ef3a2db2493b3dedd64a6aa35ff (patch)
treee93af24c8ce2ec1184b879111a85ce106ff45038 /tests/src/com
parentb88436effd845e1943323d5ce7adb743676579e5 (diff)
downloadandroid_packages_apps_Calendar-ae5bcce4a24c1ef3a2db2493b3dedd64a6aa35ff.tar.gz
android_packages_apps_Calendar-ae5bcce4a24c1ef3a2db2493b3dedd64a6aa35ff.tar.bz2
android_packages_apps_Calendar-ae5bcce4a24c1ef3a2db2493b3dedd64a6aa35ff.zip
Sort and uniquify reminders
Reminders are now sorted before display, and sorted+uniquified before being saved. Also, removed a redundant function. Bug 3409286 Change-Id: I858708c166bad686cbc2db826d964612bc9f29d8
Diffstat (limited to 'tests/src/com')
-rw-r--r--tests/src/com/android/calendar/event/EditEventHelperTest.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/src/com/android/calendar/event/EditEventHelperTest.java b/tests/src/com/android/calendar/event/EditEventHelperTest.java
index 106a19ef..8248f045 100644
--- a/tests/src/com/android/calendar/event/EditEventHelperTest.java
+++ b/tests/src/com/android/calendar/event/EditEventHelperTest.java
@@ -20,6 +20,7 @@ import com.android.calendar.AbstractCalendarActivity;
import com.android.calendar.AsyncQueryService;
import com.android.calendar.CalendarEventModel;
import com.android.calendar.R;
+import com.android.calendar.event.EventViewUtils;
import android.content.ContentProvider;
import android.content.ContentProviderOperation;
@@ -1039,18 +1040,17 @@ public class EditEventHelperTest extends AndroidTestCase {
@SmallTest
public void testConstructReminderLabel() {
mActivity = buildTestContext();
- mHelper = new EditEventHelper(mActivity, null);
- String label = mHelper.constructReminderLabel(35, true);
+ String label = EventViewUtils.constructReminderLabel(mActivity, 35, true);
assertEquals(label, "35 mins");
- label = mHelper.constructReminderLabel(72, false);
+ label = EventViewUtils.constructReminderLabel(mActivity, 72, false);
assertEquals(label, "72 minutes");
- label = mHelper.constructReminderLabel(60, true);
+ label = EventViewUtils.constructReminderLabel(mActivity, 60, true);
assertEquals(label, "1 hours");
- label = mHelper.constructReminderLabel(60 * 48, true);
+ label = EventViewUtils.constructReminderLabel(mActivity, 60 * 48, true);
assertEquals(label, "2 days");
}