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

Revert "[Settings] Remove dependency of TelephonyIntents"

Browse Source 
This reverts commit 6a6b416c3d.

Reason for revert: b/148838390

Change-Id: I9be2c370c6923e9d7293e4eff5306bc54d49ade2
This commit is contained in:
Morten Krogh-Jespersen
2020-02-04 13:10:59 +00:00
parent 6a6b416c3d
commit 36d1c17c71
3 changed files with 20 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java
View File

@@ -33,19 +33,14 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.robolectric.Shadows.shadowOf;
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.ArrayMap;
import android.util.FeatureFlagUtils;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.core.FeatureFlags;
import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardController;
import com.android.settings.homepage.contextualcards.conditional.ConditionFooterContextualCard;
@@ -63,9 +58,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowSubscriptionManager;
import org.robolectric.shadows.ShadowTelephonyManager;
import java.util.ArrayList;
import java.util.Arrays;
@@ -73,9 +67,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@RunWith(AndroidJUnit4.class)
@RunWith(RobolectricTestRunner.class)
public class ContextualCardManagerTest {
private static final int SUB_ID = 2;
private static final String TEST_SLICE_URI = "context://test/test";
private static final String TEST_SLICE_NAME = "test_name";
@@ -86,8 +79,6 @@ public class ContextualCardManagerTest {
Lifecycle mLifecycle;
private Context mContext;
private ShadowSubscriptionManager mShadowSubscriptionManager;
private ShadowTelephonyManager mShadowTelephonyManager;
private ContextualCardManager mManager;
@Before
@@ -95,16 +86,6 @@ public class ContextualCardManagerTest {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.CONDITIONAL_CARDS, true);
mShadowSubscriptionManager = shadowOf(
mContext.getSystemService(SubscriptionManager.class));
mShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID);
final TelephonyManager telephonyManager =
mContext.getSystemService(TelephonyManager.class);
mShadowTelephonyManager = shadowOf(telephonyManager);
mShadowTelephonyManager.setTelephonyManagerForSubscriptionId(SUB_ID, telephonyManager);
mManager = new ContextualCardManager(mContext, mLifecycle, null /* bundle */);
}

27
tests/robotests/src/com/android/settings/homepage/contextualcards/ControllerRendererPoolTest.java
View File

@@ -18,13 +18,7 @@ package com.android.settings.homepage.contextualcards;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
import android.content.Context;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import androidx.lifecycle.LifecycleOwner;
@@ -33,17 +27,11 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowSubscriptionManager;
import org.robolectric.shadows.ShadowTelephonyManager;
@RunWith(RobolectricTestRunner.class)
public class ControllerRendererPoolTest {
private static final int SUB_ID = 1;
private static final int UNSUPPORTED_CARD_TYPE = -99999;
private static final int UNSUPPORTED_VIEW_TYPE = -99999;
@@ -53,27 +41,12 @@ public class ControllerRendererPoolTest {
private Lifecycle mLifecycle;
private LifecycleOwner mLifecycleOwner;
@Mock
private TelephonyManager mTelephonyMgr;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
// SubscriptionManager and TelephonyManager for CellularDataConditionController
ShadowSubscriptionManager shadowSubscriptionMgr = shadowOf(
mContext.getSystemService(SubscriptionManager.class));
shadowSubscriptionMgr.setDefaultDataSubscriptionId(SUB_ID);
ShadowTelephonyManager shadowTelephonyMgr = Shadow.extract(
mContext.getSystemService(TelephonyManager.class));
shadowTelephonyMgr.setTelephonyManagerForSubscriptionId(SUB_ID, mTelephonyMgr);
when(mTelephonyMgr.createForSubscriptionId(anyInt())).thenReturn(mTelephonyMgr);
mPool = new ControllerRendererPool();
}