resolved conflicts for merge of 013fda07 to ics-ub-calendar-burgundy

Change-Id: Ia398c0dc2d7eed35e9d1f172e23e0f5c38923be3

1 files changed, 1 insertions, 20 deletions

diff --git a/tests/src/com/android/calendar/alerts/AlertServiceTest.java b/tests/src/com/android/calendar/alerts/AlertServiceTest.java
index 4ba65943..ef472866 100644
--- a/tests/src/com/android/calendar/alerts/AlertServiceTest.java
+++ b/tests/src/com/android/calendar/alerts/AlertServiceTest.java
@@ -254,7 +254,7 @@ public class AlertServiceTest extends AndroidTestCase {
 
     }
 
-    class NotificationTestManager implements NotificationMgr {
+    class NotificationTestManager extends NotificationMgr {
         // Expected notifications
         NotificationInstance[] mExpectedNotifications;
         NotificationWrapper[] mActualNotifications;
@@ -377,31 +377,12 @@ public class AlertServiceTest extends AndroidTestCase {
             assertNull("Unexpected cancel for id " + id, mExpectedNotifications[id]);
         }
 
-        @Override
-        public void cancel(String tag, int id) {
-            throw new IllegalArgumentException();
-        }
-
-        @Override
-        public void cancelAll() {
-            for (int i = 0; i < mExpectedNotifications.length; i++) {
-                assertNull("Expecting notification id " + i + ". Got cancelAll",
-                        mExpectedNotifications[i]);
-            }
-        }
-
-        @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);
             assertNull("id already used: " + id, mActualNotifications[id]);
             mActualNotifications[id] = nw;
         }
-
-        @Override
-        public void notify(String tag, int id, NotificationWrapper nw) {
-            throw new IllegalArgumentException();
-        }
     }
 
     private class MockAlarmManager implements AlarmManagerInterface {