1 files changed, 28 insertions, 12 deletions

diff --git a/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java b/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java
index f2917181..abadde31 100644
--- a/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java
+++ b/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java
@@ -18,16 +18,18 @@ package com.android.tv;
 
 import static com.android.tv.TimeShiftManager.INVALID_TIME;
 import static com.android.tv.TimeShiftManager.REQUEST_TIMEOUT_MS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import android.support.test.annotation.UiThreadTest;
 import android.support.test.filters.MediumTest;
-
+import android.support.test.runner.AndroidJUnit4;
+import com.android.tv.testing.activities.BaseMainActivityTestCase;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class CurrentPositionMediatorTest extends BaseMainActivityTestCase {
     private TimeShiftManager.CurrentPositionMediator mMediator;
 
@@ -51,8 +53,12 @@ public class CurrentPositionMediatorTest extends BaseMainActivityTestCase {
     public void testOnSeekRequested() {
         long seekToTimeMs = System.currentTimeMillis() - REQUEST_TIMEOUT_MS * 3;
         mMediator.onSeekRequested(seekToTimeMs);
-        assertNotSame("Seek request time", INVALID_TIME, mMediator.mSeekRequestTimeMs);
-        assertEquals("Current position", seekToTimeMs, mMediator.mCurrentPositionMs);
+        assertWithMessage("Seek request time")
+                .that(mMediator.mSeekRequestTimeMs)
+                .isNotSameAs(INVALID_TIME);
+        assertWithMessage("Current position")
+                .that(mMediator.mCurrentPositionMs)
+                .isEqualTo(seekToTimeMs);
     }
 
     @UiThreadTest
@@ -62,9 +68,15 @@ public class CurrentPositionMediatorTest extends BaseMainActivityTestCase {
         long newCurrentTimeMs = seekToTimeMs + REQUEST_TIMEOUT_MS;
         mMediator.onSeekRequested(seekToTimeMs);
         mMediator.onCurrentPositionChanged(newCurrentTimeMs);
-        assertNotSame("Seek request time", INVALID_TIME, mMediator.mSeekRequestTimeMs);
-        assertNotSame("Current position", seekToTimeMs, mMediator.mCurrentPositionMs);
-        assertNotSame("Current position", newCurrentTimeMs, mMediator.mCurrentPositionMs);
+        assertWithMessage("Seek request time")
+                .that(mMediator.mSeekRequestTimeMs)
+                .isNotSameAs(INVALID_TIME);
+        assertWithMessage("Current position")
+                .that(mMediator.mCurrentPositionMs)
+                .isNotSameAs(seekToTimeMs);
+        assertWithMessage("Current position")
+                .that(mMediator.mCurrentPositionMs)
+                .isNotSameAs(newCurrentTimeMs);
     }
 
     @UiThreadTest
@@ -77,9 +89,13 @@ public class CurrentPositionMediatorTest extends BaseMainActivityTestCase {
         assertCurrentPositionMediator(INVALID_TIME, newCurrentTimeMs);
     }
 
-    private void assertCurrentPositionMediator(long expectedSeekRequestTimeMs,
-            long expectedCurrentPositionMs) {
-        assertEquals("Seek request time", expectedSeekRequestTimeMs, mMediator.mSeekRequestTimeMs);
-        assertEquals("Current position", expectedCurrentPositionMs, mMediator.mCurrentPositionMs);
+    private void assertCurrentPositionMediator(
+            long expectedSeekRequestTimeMs, long expectedCurrentPositionMs) {
+        assertWithMessage("Seek request time")
+                .that(mMediator.mSeekRequestTimeMs)
+                .isEqualTo(expectedSeekRequestTimeMs);
+        assertWithMessage("Current position")
+                .that(mMediator.mCurrentPositionMs)
+                .isEqualTo(expectedCurrentPositionMs);
     }
 }