diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-09 19:19:21 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-09 19:19:21 +0000 |
commit | 411c4a576a92253a386784dddb646a2671b5d6f9 (patch) | |
tree | d31e2adc1f9cce4f27ca07d30bee921032e33a3c /tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java | |
parent | bc7f430decab0bc34a533811efe457d4615f28aa (diff) | |
parent | bb2e798ef4d546dd54cd9e95796403062b860c15 (diff) | |
download | TV-411c4a576a92253a386784dddb646a2671b5d6f9.tar.gz |
Snap for 4384531 from bb2e798ef4d546dd54cd9e95796403062b860c15 to oc-m2-releaseandroid-8.1.0_r8android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: I06099c50eb5f4c5791fab1e6055cca20fb367c6d
Diffstat (limited to 'tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java')
-rw-r--r-- | tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java b/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java index 899083f3..f2917181 100644 --- a/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java +++ b/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java @@ -18,33 +18,37 @@ 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 android.support.test.annotation.UiThreadTest; import android.support.test.filters.MediumTest; -import android.test.UiThreadTest; + +import org.junit.Before; +import org.junit.Test; @MediumTest public class CurrentPositionMediatorTest extends BaseMainActivityTestCase { private TimeShiftManager.CurrentPositionMediator mMediator; - public CurrentPositionMediatorTest() { - super(MainActivity.class); - } - @Override - protected void setUp() throws Exception { + @Before + public void setUp() { super.setUp(); mMediator = mActivity.getTimeShiftManager().mCurrentPositionMediator; } @UiThreadTest - public void testInitialize() throws Throwable { + @Test + public void testInitialize() { long currentTimeMs = System.currentTimeMillis(); mMediator.initialize(currentTimeMs); assertCurrentPositionMediator(INVALID_TIME, currentTimeMs); } @UiThreadTest - public void testOnSeekRequested() throws Throwable { + @Test + public void testOnSeekRequested() { long seekToTimeMs = System.currentTimeMillis() - REQUEST_TIMEOUT_MS * 3; mMediator.onSeekRequested(seekToTimeMs); assertNotSame("Seek request time", INVALID_TIME, mMediator.mSeekRequestTimeMs); @@ -52,7 +56,8 @@ public class CurrentPositionMediatorTest extends BaseMainActivityTestCase { } @UiThreadTest - public void testOnCurrentPositionChangedInvalidInput() throws Throwable { + @Test + public void testOnCurrentPositionChangedInvalidInput() { long seekToTimeMs = System.currentTimeMillis() - REQUEST_TIMEOUT_MS * 3; long newCurrentTimeMs = seekToTimeMs + REQUEST_TIMEOUT_MS; mMediator.onSeekRequested(seekToTimeMs); @@ -63,7 +68,8 @@ public class CurrentPositionMediatorTest extends BaseMainActivityTestCase { } @UiThreadTest - public void testOnCurrentPositionChangedValidInput() throws Throwable { + @Test + public void testOnCurrentPositionChangedValidInput() { long seekToTimeMs = System.currentTimeMillis() - REQUEST_TIMEOUT_MS * 3; long newCurrentTimeMs = seekToTimeMs + REQUEST_TIMEOUT_MS - 1; mMediator.onSeekRequested(seekToTimeMs); |