diff options
Diffstat (limited to 'services/QualifiedNetworksService/tests/src/com/android/telephony/qns')
3 files changed, 109 insertions, 3 deletions
diff --git a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/CellularQualityMonitorTest.java b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/CellularQualityMonitorTest.java index 6ab2566..e2fbb5b 100644 --- a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/CellularQualityMonitorTest.java +++ b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/CellularQualityMonitorTest.java @@ -99,7 +99,10 @@ public final class CellularQualityMonitorTest extends QnsTest { MockitoAnnotations.initMocks(this); super.setUp(); mCellularQualityMonitor = - new CellularQualityMonitor(sMockContext, mMockQnsTelephonyListener, mSlotIndex); + new CellularQualityMonitor(sMockContext, + mMockQnsConfigManager, + mMockQnsTelephonyListener, + mSlotIndex); mLatch = new CountDownLatch(1); mThresholdListener = new ThresholdListener(mExecutor); diff --git a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsCarrierConfigManagerTest.java b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsCarrierConfigManagerTest.java index fb3bd67..f39ea40 100644 --- a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsCarrierConfigManagerTest.java +++ b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsCarrierConfigManagerTest.java @@ -16,16 +16,16 @@ package com.android.telephony.qns; -import static android.hardware.radio.network.SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSCP; import static android.hardware.radio.network.SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSRQ; import static android.hardware.radio.network.SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSSI; import static android.hardware.radio.network.SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSSNR; -import static android.hardware.radio.network.SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_SSRSRP; import static android.hardware.radio.network.SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_SSRSRQ; import static android.telephony.AccessNetworkConstants.TRANSPORT_TYPE_INVALID; import static android.telephony.AccessNetworkConstants.TRANSPORT_TYPE_WLAN; import static android.telephony.AccessNetworkConstants.TRANSPORT_TYPE_WWAN; +import static android.telephony.SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSCP; import static android.telephony.SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSRP; +import static android.telephony.SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_SSRSRP; import static android.telephony.SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_SSSINR; import static android.telephony.SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_UNKNOWN; @@ -467,6 +467,90 @@ public class QnsCarrierConfigManagerTest extends QnsTest { } @Test + public void testGetWwanHysteresisDbLevelWithTestbundle() { + PersistableBundle bundle = new PersistableBundle(); + bundle.putStringArray( + QnsCarrierConfigManager.KEY_QNS_CELLULAR_SIGNAL_STRENGTH_HYSTERESIS_DB_STRING_ARRAY, + new String[] {"eutran:rsrp:1"}); + mConfigManager.loadQnsAneSupportConfigurations(bundle, null); + Assert.assertEquals( + 1, + mConfigManager.getWwanHysteresisDbLevel( + AccessNetworkConstants.AccessNetworkType.EUTRAN, + SIGNAL_MEASUREMENT_TYPE_RSRP)); + + bundle.putStringArray( + QnsCarrierConfigManager.KEY_QNS_CELLULAR_SIGNAL_STRENGTH_HYSTERESIS_DB_STRING_ARRAY, + new String[] {"ngran:ssrsrp:2"}); + mConfigManager.loadQnsAneSupportConfigurations(bundle, null); + Assert.assertEquals( + 2, + mConfigManager.getWwanHysteresisDbLevel( + AccessNetworkConstants.AccessNetworkType.NGRAN, + SIGNAL_MEASUREMENT_TYPE_SSRSRP)); + + bundle.putStringArray( + QnsCarrierConfigManager.KEY_QNS_CELLULAR_SIGNAL_STRENGTH_HYSTERESIS_DB_STRING_ARRAY, + new String[] {"eutran:rsrp:-5"}); + mConfigManager.loadQnsAneSupportConfigurations(bundle, null); + Assert.assertEquals( + QnsConstants.KEY_DEFAULT_VALUE, + mConfigManager.getWwanHysteresisDbLevel( + AccessNetworkConstants.AccessNetworkType.EUTRAN, + SIGNAL_MEASUREMENT_TYPE_RSRP)); + + bundle.putStringArray( + QnsCarrierConfigManager.KEY_QNS_CELLULAR_SIGNAL_STRENGTH_HYSTERESIS_DB_STRING_ARRAY, + new String[] {"utran:rscp:5"}); + mConfigManager.loadQnsAneSupportConfigurations(bundle, null); + Assert.assertEquals( + 5, + mConfigManager.getWwanHysteresisDbLevel( + AccessNetworkConstants.AccessNetworkType.UTRAN, + SIGNAL_MEASUREMENT_TYPE_RSCP)); + + bundle.putStringArray( + QnsCarrierConfigManager.KEY_QNS_CELLULAR_SIGNAL_STRENGTH_HYSTERESIS_DB_STRING_ARRAY, + new String[] {"eutran::-2"}); + mConfigManager.loadQnsAneSupportConfigurations(bundle, null); + Assert.assertEquals( + QnsConstants.KEY_DEFAULT_VALUE, + mConfigManager.getWwanHysteresisDbLevel( + AccessNetworkConstants.AccessNetworkType.EUTRAN, + SIGNAL_MEASUREMENT_TYPE_RSRP)); + + bundle.putStringArray( + QnsCarrierConfigManager.KEY_QNS_CELLULAR_SIGNAL_STRENGTH_HYSTERESIS_DB_STRING_ARRAY, + new String[] {":rsrp:-2"}); + mConfigManager.loadQnsAneSupportConfigurations(bundle, null); + Assert.assertEquals( + QnsConstants.KEY_DEFAULT_VALUE, + mConfigManager.getWwanHysteresisDbLevel( + AccessNetworkConstants.AccessNetworkType.EUTRAN, + SIGNAL_MEASUREMENT_TYPE_RSRP)); + + bundle.putStringArray( + QnsCarrierConfigManager.KEY_QNS_CELLULAR_SIGNAL_STRENGTH_HYSTERESIS_DB_STRING_ARRAY, + new String[] {""}); + mConfigManager.loadQnsAneSupportConfigurations(bundle, null); + Assert.assertEquals( + QnsConstants.KEY_DEFAULT_VALUE, + mConfigManager.getWwanHysteresisDbLevel( + AccessNetworkConstants.AccessNetworkType.EUTRAN, + SIGNAL_MEASUREMENT_TYPE_RSRP)); + + bundle.putStringArray( + QnsCarrierConfigManager.KEY_QNS_CELLULAR_SIGNAL_STRENGTH_HYSTERESIS_DB_STRING_ARRAY, + new String[] {":"}); + mConfigManager.loadQnsAneSupportConfigurations(bundle, null); + Assert.assertEquals( + QnsConstants.KEY_DEFAULT_VALUE, + mConfigManager.getWwanHysteresisDbLevel( + AccessNetworkConstants.AccessNetworkType.EUTRAN, + SIGNAL_MEASUREMENT_TYPE_RSRP)); + } + + @Test public void testGetQnsSupportedNetCapabilitiesWithDefaultValues() { List<Integer> imsNetCapability = new ArrayList<>(); imsNetCapability.add(NetworkCapabilities.NET_CAPABILITY_IMS); diff --git a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsUtilsTest.java b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsUtilsTest.java index 7b1db18..7c68069 100644 --- a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsUtilsTest.java +++ b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsUtilsTest.java @@ -256,6 +256,8 @@ public class QnsUtilsTest extends QnsTest { String[] defaultStringArray = new String[] {"LTE", "UMTS"}; String[] defaultGapOffsetStringArray = new String[] {"eutran:rsrp:-5", "ngran:ssrsp:-2", "utran:rscp:-3"}; + String[] defaultHysteresisDbLevelStringArray = + new String[] {"eutran:rsrp:1", "ngran:ssrsp:2", "utran:rscp:5"}; String[] defaultHandoverPolicyArray = new String[] {HANDOVER_POLICY_1, HANDOVER_POLICY_2}; String[] fallbackWwanRuleWithImsUnregistered = new String[] {FALLBACK_RULE0, FALLBACK_RULE1}; @@ -515,6 +517,13 @@ public class QnsUtilsTest extends QnsTest { QnsCarrierConfigManager .KEY_QNS_ROVEIN_THRESHOLD_GAP_WITH_GUARD_TIMER_STRING_ARRAY)); assertArrayEquals( + defaultHysteresisDbLevelStringArray, + QnsUtils.getConfig( + mTestBundle, + null, + QnsCarrierConfigManager + .KEY_QNS_CELLULAR_SIGNAL_STRENGTH_HYSTERESIS_DB_STRING_ARRAY)); + assertArrayEquals( defaultHandoverPolicyArray, QnsUtils.getConfig( mTestBundle, @@ -662,6 +671,9 @@ public class QnsUtilsTest extends QnsTest { mTestBundle.putStringArray( QnsCarrierConfigManager.KEY_QNS_FALLBACK_ON_INITIAL_CONNECTION_FAILURE_STRING_ARRAY, new String[] {"ims:2:30000:60000:5", "mms:1:10000:5000:2"}); + mTestBundle.putStringArray( + QnsCarrierConfigManager.KEY_QNS_CELLULAR_SIGNAL_STRENGTH_HYSTERESIS_DB_STRING_ARRAY, + new String[] {"eutran:rsrp:1", "ngran:ssrsp:2", "utran:rscp:5"}); } @Test @@ -1079,6 +1091,13 @@ public class QnsUtilsTest extends QnsTest { null, QnsCarrierConfigManager .KEY_QNS_FALLBACK_ON_INITIAL_CONNECTION_FAILURE_STRING_ARRAY)); + assertArrayEquals( + (String[]) null, + QnsUtils.getConfig( + null, + null, + QnsCarrierConfigManager + .KEY_QNS_CELLULAR_SIGNAL_STRENGTH_HYSTERESIS_DB_STRING_ARRAY)); } @Test |