summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNagendra Prasad Nagarle Basavaraju <nagendranb@google.com>2023-02-21 13:54:25 +0000
committerNagendra Prasad Nagarle Basavaraju <nagendranb@google.com>2023-02-24 07:25:22 +0000
commit51089ab4b2497cc252269326a95870d279d1da17 (patch)
tree1bfa0022b159da0e47ec6a656885ed3adf57e1de
parent9dc314f1e62cc381cd38f3ad4d8f5651a32ca9d7 (diff)
downloadTelephony-51089ab4b2497cc252269326a95870d279d1da17.tar.gz
[QNS] Fix junit test for AccessNetworkEvaluatorTest
- Fix Junit test failure at testCachedPreferredTransportTypeForEmergency Bug: 270130207 Test: atest com.android.telephony.qns.AccessNetworkEvaluatorTest Change-Id: I8583c8288d29461fc1394ea1171954daf829a536
-rw-r--r--services/QualifiedNetworksService/tests/src/com/android/telephony/qns/AccessNetworkEvaluatorTest.java10
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(