Snap for 4378450 from 6ebde20b03db4c0d57f67acaac11832b610b966b to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release

Change-Id: I07f19344c030a9c2b0fd7ba425f7bf7462575f92

1 files changed, 17 insertions, 5 deletions

diff --git a/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java b/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java
index c76de8fb..db765109 100644
--- a/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java
+++ b/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java
@@ -16,11 +16,16 @@
 
 package com.android.tv.recommendation;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 
 import com.android.tv.testing.Utils;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
@@ -28,31 +33,33 @@ import java.util.concurrent.TimeUnit;
  * Unit tests for {@link ChannelRecord}.
  */
 @SmallTest
-public class ChannelRecordTest extends AndroidTestCase {
+public class ChannelRecordTest {
     private static final int CHANNEL_RECORD_MAX_HISTORY_SIZE = ChannelRecord.MAX_HISTORY_SIZE;
 
     private Random mRandom;
     private ChannelRecord mChannelRecord;
     private long mLatestWatchEndTimeMs;
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         mLatestWatchEndTimeMs = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1);
         mChannelRecord = new ChannelRecord(getContext(), null, false);
         mRandom = Utils.createTestRandom();
     }
 
+    @Test
     public void testGetLastWatchEndTime_noHistory() {
         assertEquals(0, mChannelRecord.getLastWatchEndTimeMs());
     }
 
+    @Test
     public void testGetLastWatchEndTime_oneHistory() {
         addWatchLog();
 
         assertEquals(mLatestWatchEndTimeMs, mChannelRecord.getLastWatchEndTimeMs());
     }
 
+    @Test
     public void testGetLastWatchEndTime_maxHistories() {
         for (int i = 0; i < CHANNEL_RECORD_MAX_HISTORY_SIZE; ++i) {
             addWatchLog();
@@ -61,6 +68,7 @@ public class ChannelRecordTest extends AndroidTestCase {
         assertEquals(mLatestWatchEndTimeMs, mChannelRecord.getLastWatchEndTimeMs());
     }
 
+    @Test
     public void testGetLastWatchEndTime_moreThanMaxHistories() {
         for (int i = 0; i < CHANNEL_RECORD_MAX_HISTORY_SIZE + 1; ++i) {
             addWatchLog();
@@ -69,16 +77,19 @@ public class ChannelRecordTest extends AndroidTestCase {
         assertEquals(mLatestWatchEndTimeMs, mChannelRecord.getLastWatchEndTimeMs());
     }
 
+    @Test
     public void testGetTotalWatchDuration_noHistory() {
         assertEquals(0, mChannelRecord.getTotalWatchDurationMs());
     }
 
+    @Test
     public void testGetTotalWatchDuration_oneHistory() {
         long durationMs = addWatchLog();
 
         assertEquals(durationMs, mChannelRecord.getTotalWatchDurationMs());
     }
 
+    @Test
     public void testGetTotalWatchDuration_maxHistories() {
         long totalWatchTimeMs = 0;
         for (int i = 0; i < CHANNEL_RECORD_MAX_HISTORY_SIZE; ++i) {
@@ -89,6 +100,7 @@ public class ChannelRecordTest extends AndroidTestCase {
         assertEquals(totalWatchTimeMs, mChannelRecord.getTotalWatchDurationMs());
     }
 
+    @Test
     public void testGetTotalWatchDuration_moreThanMaxHistories() {
         long totalWatchTimeMs = 0;
         long firstDurationMs = 0;