1 files changed, 20 insertions, 12 deletions

diff --git a/tests/unit/src/com/android/tv/dvr/SchedulerTest.java b/tests/unit/src/com/android/tv/dvr/SchedulerTest.java
index 6748eddb..140d9091 100644
--- a/tests/unit/src/com/android/tv/dvr/SchedulerTest.java
+++ b/tests/unit/src/com/android/tv/dvr/SchedulerTest.java
@@ -24,11 +24,13 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
+import android.os.Build;
 import android.os.Looper;
 import android.support.test.filters.SdkSuppress;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import com.android.tv.data.ChannelDataManager;
 import com.android.tv.testing.FakeClock;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 
@@ -41,22 +43,27 @@ import java.util.concurrent.TimeUnit;
  * Tests for {@link Scheduler}.
  */
 @SmallTest
-@SdkSuppress(minSdkVersion = 23)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
 public class SchedulerTest extends AndroidTestCase {
-    private FakeClock mClock;
+    private static final int CHANNEL_ID = 273;
+
+    private FakeClock mFakeClock;
     private DvrDataManagerInMemoryImpl mDataManager;
     private Scheduler mScheduler;
+    @Mock DvrManager mDvrManager;
     @Mock DvrSessionManager mSessionManager;
     @Mock AlarmManager mMockAlarmManager;
+    @Mock
+    ChannelDataManager mChannelDataManager;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         MockitoAnnotations.initMocks(this);
-        mClock = FakeClock.createWithCurrentTime();
-        mDataManager = new DvrDataManagerInMemoryImpl(getContext());
-        mScheduler = new Scheduler(Looper.myLooper(), mSessionManager, mDataManager, getContext(),
-                mClock, mMockAlarmManager);
+        mFakeClock = FakeClock.createWithCurrentTime();
+        mDataManager = new DvrDataManagerInMemoryImpl(getContext(), mFakeClock);
+        mScheduler = new Scheduler(Looper.myLooper(), mDvrManager, mSessionManager, mDataManager,
+                mChannelDataManager, getContext(), mFakeClock, mMockAlarmManager);
     }
 
     public void testUpdate_none() throws Exception {
@@ -65,11 +72,12 @@ public class SchedulerTest extends AndroidTestCase {
     }
 
     public void testUpdate_nextIn12Hours() throws Exception {
-        long now = mClock.currentTimeMillis();
+        long now = mFakeClock.currentTimeMillis();
         long startTime = now + TimeUnit.HOURS.toMillis(12);
-        Recording r = RecordingTestUtils.createTestRecordingWithPeriod(startTime,
+        ScheduledRecording r = RecordingTestUtils
+                .createTestRecordingWithPeriod(CHANNEL_ID, startTime,
                 startTime + TimeUnit.HOURS.toMillis(1));
-        mDataManager.addRecording(r);
+        mDataManager.addScheduledRecording(r);
         mScheduler.update();
         verify(mMockAlarmManager).set(
                 eq(AlarmManager.RTC_WAKEUP),
@@ -78,10 +86,10 @@ public class SchedulerTest extends AndroidTestCase {
     }
 
     public void testStartsWithin() throws Exception {
-        long now = mClock.currentTimeMillis();
+        long now = mFakeClock.currentTimeMillis();
         long startTime = now + 3;
-        Recording r = RecordingTestUtils
-                .createTestRecordingWithPeriod(startTime, startTime + 100);
+        ScheduledRecording r = RecordingTestUtils
+                .createTestRecordingWithPeriod(273, startTime, startTime + 100);
         assertFalse(mScheduler.startsWithin(r, 2));
         assertTrue(mScheduler.startsWithin(r, 3));
     }