Merge "Fix Wi-Fi calling test case" into main
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java
index 2165bc9..3adcbdb 100644
--- a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java
@@ -48,7 +48,6 @@
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -115,7 +114,7 @@
mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, true);
when(mTelecomManager.getSimCallManagerForSubscription(SUB_ID))
.thenReturn(mPhoneAccountHandle);
- mMockQueryWfcState = new MockWfcQueryImsState(mContext, SUB_ID);
+ mMockQueryWfcState = spy(new MockWfcQueryImsState(mContext, SUB_ID));
if (Looper.myLooper() == null) {
Looper.prepare();
@@ -177,11 +176,11 @@
}
@Test
- @Ignore("b/337417499")
public void
shouldShowWifiCallingForSub_wifiCallingEnabledWithActivityHandleIntent_returnTrue() {
buildPhoneAccountConfigureIntent(true);
doReturn(mMockQueryWfcState).when(mNetworkProviderWifiCallingGroup).queryImsState(SUB_ID);
+ doReturn(true).when(mMockQueryWfcState).isReadyToWifiCalling();
doReturn(mPhoneAccountHandle).when(mNetworkProviderWifiCallingGroup)
.getPhoneAccountHandleForSubscriptionId(SUB_ID);