1 files changed, 13 insertions, 24 deletions

diff --git a/tests/unit/src/com/android/telephony/imsmedia/VideoListenerTest.java b/tests/unit/src/com/android/telephony/imsmedia/VideoListenerTest.java
index ad90f957..d00ccb1b 100644
--- a/tests/unit/src/com/android/telephony/imsmedia/VideoListenerTest.java
+++ b/tests/unit/src/com/android/telephony/imsmedia/VideoListenerTest.java
@@ -22,23 +22,25 @@ import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import android.os.Looper;
 import android.os.Parcel;
 import android.os.RemoteException;
 import android.telephony.imsmedia.IImsVideoSessionCallback;
 import android.telephony.imsmedia.ImsMediaSession;
 import android.telephony.imsmedia.VideoConfig;
+import android.testing.AndroidTestingRunner;
 import android.testing.TestableLooper;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-@RunWith(JUnit4.class)
-public class VideoListenerTest {
+@RunWith(AndroidTestingRunner.class)
+@TestableLooper.RunWithLooper
+public class VideoListenerTest extends ImsMediaTest {
     private static final int SESSION_ID = 1;
     private static final long VIDEO_DATA = 1024;
     private static final int RESOLUTION_WIDTH = 640;
@@ -54,31 +56,24 @@ public class VideoListenerTest {
     @Mock
     private IImsVideoSessionCallback mMockIImsVideoSessionCallback;
     private VideoConfig mVideoConfig;
-    private TestableLooper mLooper;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         VideoSession videoSession = new VideoSession(SESSION_ID, mMockIImsVideoSessionCallback,
-                mVideoService, mMockVideoLocalSession);
+                mVideoService, mMockVideoLocalSession, Looper.myLooper());
         VideoSession.VideoSessionHandler handler = videoSession.getVideoSessionHandler();
         mVideoListener = new VideoListener(handler);
         mVideoListener.setMediaCallback(mMockCallback);
         mVideoListener.setNativeObject(NATIVE_OBJECT);
         mVideoConfig = VideoConfigTest.createVideoConfig();
-        try {
-            mLooper = new TestableLooper(handler.getLooper());
-        } catch (Exception e) {
-            throw new AssertionError("Unable to create TestableLooper", e);
-        }
+        mTestClass = VideoListenerTest.this;
+        super.setUp();
     }
 
     @After
-    public void tearDown() {
-        if (mLooper != null) {
-            mLooper.destroy();
-            mLooper = null;
-        }
+    public void tearDown() throws Exception {
+        super.tearDown();
     }
 
     private Parcel createParcel(int event, int result) {
@@ -170,14 +165,14 @@ public class VideoListenerTest {
     }
 
     @Test
-    public void testEventPacketLossInd() throws RemoteException {
-        Parcel parcel = createParcel(VideoSession.EVENT_PACKET_LOSS_IND,
+    public void testEventNotifyBitrateInd() throws RemoteException {
+        Parcel parcel = createParcel(VideoSession.EVENT_NOTIFY_BITRATE_IND,
                 ImsMediaSession.PACKET_TYPE_RTCP);
         mVideoListener.onMessage(parcel);
         processAllMessages();
         parcel.recycle();
         verify(mMockIImsVideoSessionCallback,
-                times(1)).notifyPacketLoss(eq(ImsMediaSession.PACKET_TYPE_RTCP));
+                times(1)).notifyBitrate(eq(ImsMediaSession.PACKET_TYPE_RTCP));
     }
 
     @Test
@@ -201,10 +196,4 @@ public class VideoListenerTest {
         parcel.recycle();
         verify(mMockCallback, times(1)).onSessionClosed(eq(SESSION_ID));
     }
-
-    private void processAllMessages() {
-        while (!mLooper.getLooper().getQueue().isIdle()) {
-            mLooper.processAllMessages();
-        }
-    }
 }