diff options
Diffstat (limited to 'tests/unit/src/com/android/telephony')
4 files changed, 28 insertions, 7 deletions
diff --git a/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java b/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java index 23ec9b0d..c3013544 100644 --- a/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java +++ b/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java @@ -259,7 +259,8 @@ public class AudioOffloadTest extends ImsMediaTest { @Test public void testSetMediaQualityThreshold() { // Set Media Quality Threshold - MediaQualityThreshold threshold = MediaQualityThresholdTest.createMediaQualityThreshold(); + MediaQualityThreshold threshold = + MediaQualityThresholdTest.createMediaQualityThresholdForHal(); audioSession.setMediaQualityThreshold(threshold); processAllMessages(); try { diff --git a/tests/unit/src/com/android/telephony/imsmedia/MediaQualityThresholdTest.java b/tests/unit/src/com/android/telephony/imsmedia/MediaQualityThresholdTest.java index 40dfe866..d61e0f33 100644 --- a/tests/unit/src/com/android/telephony/imsmedia/MediaQualityThresholdTest.java +++ b/tests/unit/src/com/android/telephony/imsmedia/MediaQualityThresholdTest.java @@ -37,6 +37,7 @@ public class MediaQualityThresholdTest { private static final int[] PACKET_LOSS_RATE = { 1, 3 }; private static final int[] JITTER_THRESHOLD = { 100, 200 }; private static final boolean NOTIFY_STATUS = false; + private static final int VIDEO_BITRATE_BPS = 100000; @Test public void testConstructorAndGetters() { @@ -48,6 +49,7 @@ public class MediaQualityThresholdTest { assertThat(Arrays.equals(threshold.getRtpPacketLossRate(), PACKET_LOSS_RATE)).isTrue(); assertThat(Arrays.equals(threshold.getRtpJitterMillis(), JITTER_THRESHOLD)).isTrue(); assertThat(threshold.getNotifyCurrentStatus()).isEqualTo(NOTIFY_STATUS); + assertThat(threshold.getVideoBitrateBps()).isEqualTo(VIDEO_BITRATE_BPS); } @Test @@ -82,6 +84,7 @@ public class MediaQualityThresholdTest { .setRtpPacketLossRate(PACKET_LOSS_RATE) .setRtpJitterMillis(JITTER_THRESHOLD) .setNotifyCurrentStatus(NOTIFY_STATUS) + .setVideoBitrateBps(VIDEO_BITRATE_BPS) .build(); assertThat(threshold1).isNotEqualTo(threshold2); @@ -94,6 +97,7 @@ public class MediaQualityThresholdTest { .setRtpPacketLossRate(PACKET_LOSS_RATE) .setRtpJitterMillis(JITTER_THRESHOLD) .setNotifyCurrentStatus(NOTIFY_STATUS) + .setVideoBitrateBps(VIDEO_BITRATE_BPS) .build(); assertThat(threshold1).isNotEqualTo(threshold3); @@ -106,6 +110,7 @@ public class MediaQualityThresholdTest { .setRtpPacketLossRate(PACKET_LOSS_RATE) .setRtpJitterMillis(JITTER_THRESHOLD) .setNotifyCurrentStatus(NOTIFY_STATUS) + .setVideoBitrateBps(VIDEO_BITRATE_BPS) .build(); assertThat(threshold1).isNotEqualTo(threshold4); @@ -119,6 +124,7 @@ public class MediaQualityThresholdTest { .setRtpPacketLossRate(PACKET_LOSS_RATE) .setRtpJitterMillis(JITTER_THRESHOLD) .setNotifyCurrentStatus(NOTIFY_STATUS) + .setVideoBitrateBps(VIDEO_BITRATE_BPS) .build(); assertThat(threshold1).isNotEqualTo(threshold5); @@ -133,6 +139,20 @@ public class MediaQualityThresholdTest { .setRtpPacketLossRate(PACKET_LOSS_RATE) .setRtpJitterMillis(JITTER_THRESHOLD) .setNotifyCurrentStatus(NOTIFY_STATUS) + .setVideoBitrateBps(VIDEO_BITRATE_BPS) + .build(); + } + + static MediaQualityThreshold createMediaQualityThresholdForHal() { + return new MediaQualityThreshold.Builder() + .setRtpInactivityTimerMillis(RTP_TIMEOUT) + .setRtcpInactivityTimerMillis(RTCP_TIMEOUT) + .setRtpHysteresisTimeInMillis(RTP_HYSTERESIS_TIME) + .setRtpPacketLossDurationMillis(RTP_PACKET_LOSS_DURATION) + .setRtpPacketLossRate(PACKET_LOSS_RATE) + .setRtpJitterMillis(JITTER_THRESHOLD) + .setNotifyCurrentStatus(NOTIFY_STATUS) + .setVideoBitrateBps(0) .build(); } } diff --git a/tests/unit/src/com/android/telephony/imsmedia/VideoListenerTest.java b/tests/unit/src/com/android/telephony/imsmedia/VideoListenerTest.java index a9948d22..d00ccb1b 100644 --- a/tests/unit/src/com/android/telephony/imsmedia/VideoListenerTest.java +++ b/tests/unit/src/com/android/telephony/imsmedia/VideoListenerTest.java @@ -165,14 +165,14 @@ public class VideoListenerTest extends ImsMediaTest { } @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 diff --git a/tests/unit/src/com/android/telephony/imsmedia/VideoSessionTest.java b/tests/unit/src/com/android/telephony/imsmedia/VideoSessionTest.java index 600f9778..d9e4b897 100644 --- a/tests/unit/src/com/android/telephony/imsmedia/VideoSessionTest.java +++ b/tests/unit/src/com/android/telephony/imsmedia/VideoSessionTest.java @@ -285,12 +285,12 @@ public class VideoSessionTest extends ImsMediaTest { @Test public void testPacketLossInd() { // Receive Packet Loss - Utils.sendMessage(mHandler, VideoSession.EVENT_PACKET_LOSS_IND, PACKET_LOSS, UNUSED); + Utils.sendMessage(mHandler, VideoSession.EVENT_NOTIFY_BITRATE_IND, PACKET_LOSS, UNUSED); processAllMessages(); try { - verify(mCallback, times(1)).notifyPacketLoss(eq(PACKET_LOSS)); + verify(mCallback, times(1)).notifyBitrate(eq(PACKET_LOSS)); } catch (RemoteException e) { - fail("Failed to notify notifyPacketLoss: " + e); + fail("Failed to notify notifyBitrate: " + e); } } |