Sync to ub-tv-friends at 1.06.202

git hash 3c1965f5dcc60243f1fe600cb35f19bd5f01fc27

Change-Id: I90b77790f9074677ecef72a23235d2b33eacb76a

7 files changed, 22 insertions, 3 deletions

diff --git a/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java b/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java
index 9b0e2805..44026386 100644
--- a/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java
+++ b/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java
@@ -17,6 +17,7 @@
 package com.android.tv.recommendation;
 
 import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
 
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -24,6 +25,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Unit tests for {@link ChannelRecord}.
  */
+@SmallTest
 public class ChannelRecordTest extends AndroidTestCase {
     private static final int CHANNEL_RECORD_MAX_HISTORY_SIZE = ChannelRecord.MAX_HISTORY_SIZE;
 
@@ -31,6 +33,7 @@ public class ChannelRecordTest extends AndroidTestCase {
     private ChannelRecord mChannelRecord;
     private long mLatestWatchEndTimeMs;
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         mLatestWatchEndTimeMs = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1);
diff --git a/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java b/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java
index ee9fa95f..febeeda1 100644
--- a/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java
+++ b/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java
@@ -17,6 +17,7 @@
 package com.android.tv.recommendation;
 
 import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.tv.data.Channel;
 import com.android.tv.recommendation.RecommendationUtils.ChannelRecordSortedMapHelper;
@@ -36,6 +37,7 @@ public abstract class EvaluatorTestCase<T extends Evaluator> extends AndroidTest
 
     public T mEvaluator;
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         mChannelRecordSortedMap = new ChannelRecordSortedMapHelper(getContext());
diff --git a/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java b/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java
index c33271bc..0617845b 100644
--- a/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java
+++ b/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java
@@ -16,12 +16,15 @@
 
 package com.android.tv.recommendation;
 
+import android.test.suitebuilder.annotation.SmallTest;
+
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Unit tests for {@link FavoriteChannelEvaluator}.
  */
+@SmallTest
 public class FavoriteChannelEvaluatorTest extends EvaluatorTestCase<FavoriteChannelEvaluator> {
     private static final int DEFAULT_NUMBER_OF_CHANNELS = 4;
     private static final long DEFAULT_WATCH_START_TIME_MS =
@@ -30,6 +33,7 @@ public class FavoriteChannelEvaluatorTest extends EvaluatorTestCase<FavoriteChan
             System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1);
     private static final long DEFAULT_MAX_WATCH_DURATION_MS = TimeUnit.HOURS.toMillis(1);
 
+    @Override
     public FavoriteChannelEvaluator createEvaluator() {
         return new FavoriteChannelEvaluator();
     }
diff --git a/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java b/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java
index a888ceea..c67f3bc4 100644
--- a/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java
+++ b/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java
@@ -16,6 +16,8 @@
 
 package com.android.tv.recommendation;
 
+import android.test.suitebuilder.annotation.SmallTest;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,6 +26,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Unit tests for {@link RecentChannelEvaluator}.
  */
+@SmallTest
 public class RecentChannelEvaluatorTest extends EvaluatorTestCase<RecentChannelEvaluator> {
     private static final int DEFAULT_NUMBER_OF_CHANNELS = 4;
     private static final long DEFAULT_WATCH_START_TIME_MS =
@@ -32,6 +35,7 @@ public class RecentChannelEvaluatorTest extends EvaluatorTestCase<RecentChannelE
             System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1);
     private static final long DEFAULT_MAX_WATCH_DURATION_MS = TimeUnit.HOURS.toMillis(1);
 
+    @Override
     public RecentChannelEvaluator createEvaluator() {
         return new RecentChannelEvaluator();
     }
diff --git a/tests/unit/src/com/android/tv/recommendation/RecommendationUtils.java b/tests/unit/src/com/android/tv/recommendation/RecommendationUtils.java
index d275bfbb..8e57a267 100644
--- a/tests/unit/src/com/android/tv/recommendation/RecommendationUtils.java
+++ b/tests/unit/src/com/android/tv/recommendation/RecommendationUtils.java
@@ -86,7 +86,7 @@ public class RecommendationUtils {
     }
 
     public static class ChannelRecordSortedMapHelper extends TreeMap<Long, ChannelRecord> {
-        private Context mContext;
+        private final Context mContext;
         private Recommender mRecommender;
         private Random mRandom = createTestRandom();
 
diff --git a/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java b/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java
index 4f16d168..62c5b4ab 100644
--- a/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java
+++ b/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java
@@ -18,6 +18,7 @@ package com.android.tv.recommendation;
 
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
+import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.tv.data.Channel;
 import com.android.tv.recommendation.RecommendationUtils.ChannelRecordSortedMapHelper;
@@ -31,6 +32,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+@SmallTest
 public class RecommenderTest extends AndroidTestCase {
     private static final int DEFAULT_NUMBER_OF_CHANNELS = 5;
     private static final long DEFAULT_WATCH_START_TIME_MS =
@@ -69,6 +71,7 @@ public class RecommenderTest extends AndroidTestCase {
     private Channel mChannel_3;
     private Channel mChannel_4;
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
 
@@ -306,7 +309,7 @@ public class RecommenderTest extends AndroidTestCase {
     }
 
     private class FakeEvaluator extends Recommender.Evaluator {
-        private Map<Long, Double> mChannelScore = new HashMap<>();
+        private final Map<Long, Double> mChannelScore = new HashMap<>();
 
         @Override
         public double evaluateChannel(long channelId) {
diff --git a/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java b/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java
index e3c92859..2511094e 100644
--- a/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java
+++ b/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java
@@ -17,6 +17,7 @@
 package com.android.tv.recommendation;
 
 import android.test.MoreAsserts;
+import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.tv.data.Program;
 import com.android.tv.recommendation.RoutineWatchEvaluator.ProgramTime;
@@ -25,8 +26,10 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+@SmallTest
 public class RoutineWatchEvaluatorTest extends EvaluatorTestCase<RoutineWatchEvaluator> {
 
+    @Override
     public RoutineWatchEvaluator createEvaluator() {
         return new RoutineWatchEvaluator();
     }
@@ -157,7 +160,7 @@ public class RoutineWatchEvaluatorTest extends EvaluatorTestCase<RoutineWatchEva
 
     private void assertOverlappedIntervalScore(int expectedSeconds, boolean overlappedOnSameDay,
             ProgramTime t1, ProgramTime t2) {
-        double score = (double) expectedSeconds;
+        double score = expectedSeconds;
         if (!overlappedOnSameDay) {
             score *= RoutineWatchEvaluator.MULTIPLIER_FOR_UNMATCHED_DAY_OF_WEEK;
         }