Merge "Fix Wi-Fi calling test case" into main

This commit is contained in:
Weng Su
2024-06-07 03:47:24 +00:00
committed by Android (Google) Code Review

View File

@@ -48,7 +48,6 @@ import com.android.settings.network.ims.MockWfcQueryImsState;
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 @@ public class NetworkProviderWifiCallingGroupTest {
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 @@ public class NetworkProviderWifiCallingGroupTest {
}
@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);