PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enhanced4gBasePreferenceControllerTest migrated to junit"

Browse Source
This commit is contained in:
Jeremy Goldman
2020-12-14 02:58:24 +00:00
committed by Android (Google) Code Review
parent f36154fe6c 4348c2c826
commit 11f91e47ea
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
View File

@@ -185,6 +185,7 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
return this; return this;
} }
@VisibleForTesting
protected int getMode() { protected int getMode() {
return MODE_NONE; return MODE_NONE;
} }
@@ -194,12 +195,12 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
} }
@VisibleForTesting @VisibleForTesting
VolteQueryImsState queryImsState(int subId) { protected VolteQueryImsState queryImsState(int subId) {
return new VolteQueryImsState(mContext, subId); return new VolteQueryImsState(mContext, subId);
} }
@VisibleForTesting @VisibleForTesting
boolean isCallStateIdle() { protected boolean isCallStateIdle() {
return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE); return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE);
} }

19
tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java → tests/unit/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2018 The Android Open Source Project * Copyright (C) 2020 The Android Open Source Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.os.PersistableBundle; import android.os.PersistableBundle;
@@ -30,6 +31,8 @@ import android.telephony.TelephonyManager;
import android.telephony.ims.ProvisioningManager; import android.telephony.ims.ProvisioningManager;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreference;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.ims.MockVolteQueryImsState; import com.android.settings.network.ims.MockVolteQueryImsState;
@@ -40,10 +43,8 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public class Enhanced4gBasePreferenceControllerTest { public class Enhanced4gBasePreferenceControllerTest {
private static final int SUB_ID = 2; private static final int SUB_ID = 2;
@@ -69,10 +70,12 @@ public class Enhanced4gBasePreferenceControllerTest {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application); mContext = spy(ApplicationProvider.getApplicationContext());
doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class); when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class); when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class); when(mContext.getSystemService(CarrierConfigManager.class))
.thenReturn(mCarrierConfigManager);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId( doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
SubscriptionManager.INVALID_SUBSCRIPTION_ID); SubscriptionManager.INVALID_SUBSCRIPTION_ID);