From 8e93f66f4617f2f4cb3e2a1919988fdf401b51f4 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@android.com>
Date: Tue, 20 Nov 2012 17:54:25 -0800
Subject: Fix build

Change-Id: I3480b0c51dc15f7e87118959afc7f8e0dca7c53a
---
 .../android/calendar/alerts/AlertServiceTest.java  | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'tests')

diff --git a/tests/src/com/android/calendar/alerts/AlertServiceTest.java b/tests/src/com/android/calendar/alerts/AlertServiceTest.java
index 6cb65151..f9eae2d2 100644
--- a/tests/src/com/android/calendar/alerts/AlertServiceTest.java
+++ b/tests/src/com/android/calendar/alerts/AlertServiceTest.java
@@ -21,7 +21,6 @@ import static android.app.Notification.PRIORITY_HIGH;
 import static android.app.Notification.PRIORITY_MIN;
 
 import android.app.AlarmManager;
-import android.app.PendingIntent;
 import android.content.SharedPreferences;
 import android.database.MatrixCursor;
 import android.provider.CalendarContract.Attendees;
@@ -47,8 +46,7 @@ public class AlertServiceTest extends AndroidTestCase {
 
     class MockSharedPreferences implements SharedPreferences {
 
-        /* "always", "silent", depends on ringer mode */
-        private String mVibrateWhen;
+        private Boolean mVibrate;
         private String mRingtone;
         private Boolean mPopup;
 
@@ -66,14 +64,14 @@ public class AlertServiceTest extends AndroidTestCase {
         }
 
         void init() {
-            mVibrateWhen = "always";
+            mVibrate = true;
             mRingtone = "/some/cool/ringtone";
             mPopup = true;
         }
 
         @Override
         public boolean contains(String key) {
-            if (GeneralPreferences.KEY_ALERTS_VIBRATE_WHEN.equals(key)) {
+            if (GeneralPreferences.KEY_ALERTS_VIBRATE.equals(key)) {
                 return true;
             }
             return false;
@@ -81,6 +79,17 @@ public class AlertServiceTest extends AndroidTestCase {
 
         @Override
         public boolean getBoolean(String key, boolean defValue) {
+            if (GeneralPreferences.KEY_ALERTS_VIBRATE.equals(key)) {
+                if (mVibrate == null) {
+                    Assert.fail(GeneralPreferences.KEY_ALERTS_VIBRATE
+                            + " fetched more than once.");
+                }
+                boolean val = mVibrate;
+                if (mStrict) {
+                    mVibrate = null;
+                }
+                return val;
+            }
             if (GeneralPreferences.KEY_ALERTS_POPUP.equals(key)) {
                 if (mPopup == null) {
                     Assert.fail(GeneralPreferences.KEY_ALERTS_POPUP + " fetched more than once.");
@@ -96,17 +105,6 @@ public class AlertServiceTest extends AndroidTestCase {
 
         @Override
         public String getString(String key, String defValue) {
-            if (GeneralPreferences.KEY_ALERTS_VIBRATE_WHEN.equals(key)) {
-                if (mVibrateWhen == null) {
-                    Assert.fail(GeneralPreferences.KEY_ALERTS_VIBRATE_WHEN
-                            + " fetched more than once.");
-                }
-                String val = mVibrateWhen;
-                if (mStrict) {
-                    mVibrateWhen = null;
-                }
-                return val;
-            }
             if (GeneralPreferences.KEY_ALERTS_RINGTONE.equals(key)) {
                 if (mRingtone == null) {
                     Assert.fail(GeneralPreferences.KEY_ALERTS_RINGTONE
@@ -377,6 +375,7 @@ public class AlertServiceTest extends AndroidTestCase {
             assertNull("Unexpected cancel for id " + id, mExpectedNotifications[id]);
         }
 
+        @Override
         public void notify(int id, NotificationWrapper nw) {
             assertTrue("id out of bound: " + id, 0 <= id);
             assertTrue("id out of bound: " + id, id < mExpectedNotifications.length);
-- 
cgit v1.2.3