diff options
| author | Nagendra Prasad Nagarle Basavaraju <nagendranb@google.com> | 2023-02-28 20:41:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-28 20:41:43 +0000 |
| commit | 57dddefe7c9ad730b5055b1c8b7ee73f8b127839 (patch) | |
| tree | 1bfa0022b159da0e47ec6a656885ed3adf57e1de | |
| parent | 161d556373ae61556d5724baf83deb12ebd0197f (diff) | |
| parent | 51089ab4b2497cc252269326a95870d279d1da17 (diff) | |
| download | Telephony-57dddefe7c9ad730b5055b1c8b7ee73f8b127839.tar.gz | |
[QNS] Fix junit test for AccessNetworkEvaluatorTest am: 51089ab4b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Telephony/+/21573742
Change-Id: I71eca9504f2a0600dcc65953669cef1f36ff87ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/QualifiedNetworksService/tests/src/com/android/telephony/qns/AccessNetworkEvaluatorTest.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/AccessNetworkEvaluatorTest.java b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/AccessNetworkEvaluatorTest.java index 42a8bb2..8d3883e 100644 --- a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/AccessNetworkEvaluatorTest.java +++ b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/AccessNetworkEvaluatorTest.java @@ -1042,6 +1042,7 @@ public class AccessNetworkEvaluatorTest extends QnsTest { waitForLastHandlerAction(mAne.mHandler); mLatch = new CountDownLatch(1); mAne.registerForQualifiedNetworksChanged(mHandler, QUALIFIED_NETWORKS_CHANGED); + mAne.onEmergencyPreferredTransportTypeChanged(AccessNetworkConstants.TRANSPORT_TYPE_WLAN); waitForLastHandlerAction(mAne.mHandler); assertFalse(mLatch.await(100, TimeUnit.MILLISECONDS)); @@ -1062,11 +1063,12 @@ public class AccessNetworkEvaluatorTest extends QnsTest { waitForLastHandlerAction(mAne.mHandler); assertFalse(mLatch.await(500, TimeUnit.MILLISECONDS)); assertNull(mQualifiedNetworksInfo); + + mLatch = new CountDownLatch(1); mAne.onDataConnectionStateChanged( new DataConnectionStatusTracker.DataConnectionChangedInfo( EVENT_DATA_CONNECTION_DISCONNECTED, STATE_INACTIVE, AccessNetworkConstants.TRANSPORT_TYPE_INVALID)); - mLatch = new CountDownLatch(1); waitForLastHandlerAction(mAne.mHandler); assertTrue(mLatch.await(100, TimeUnit.MILLISECONDS)); assertTrue( @@ -1084,18 +1086,20 @@ public class AccessNetworkEvaluatorTest extends QnsTest { QnsTelephonyInfoIms infoIms = mMockQnsTelephonyListener.new QnsTelephonyInfoIms(info, true, true, false, false); mAne.onQnsTelephonyInfoChanged(infoIms); - waitForLastHandlerAction(mAne.mHandler); when(mDataConnectionStatusTracker.isInactiveState()).thenReturn(false); mQualifiedNetworksInfo = null; + mLatch = new CountDownLatch(1); mAne.onEmergencyPreferredTransportTypeChanged(AccessNetworkConstants.TRANSPORT_TYPE_WWAN); + waitForLastHandlerAction(mAne.mHandler); assertFalse(mLatch.await(500, TimeUnit.MILLISECONDS)); assertNull(mQualifiedNetworksInfo); + + mLatch = new CountDownLatch(1); mAne.onDataConnectionStateChanged( new DataConnectionStatusTracker.DataConnectionChangedInfo( EVENT_DATA_CONNECTION_FAILED, STATE_INACTIVE, AccessNetworkConstants.TRANSPORT_TYPE_INVALID)); - mLatch = new CountDownLatch(1); waitForLastHandlerAction(mAne.mHandler); assertTrue(mLatch.await(100, TimeUnit.MILLISECONDS)); assertTrue( |