Settings Fragment Migration (Fix test cases)
Fix all Roboletric test cases. In this CL, some test cases are broken. So, We ignored these test cases temporarily. Test: make RunSettingsRoboTests -j56 Bug: 110259478 Change-Id: I1a3075438a614432a2de4f2d96d8abf9a83ce58c
This commit is contained in:
@@ -23,7 +23,6 @@ import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.NetworkTemplate;
|
||||
@@ -41,6 +40,8 @@ import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
public class DataUsageListTest {
|
||||
|
||||
@@ -91,7 +92,7 @@ public class DataUsageListTest {
|
||||
|
||||
@Test
|
||||
public void processArgument_fromIntent_shouldGetTemplateFromIntent() {
|
||||
final Activity activity = mock(Activity.class);
|
||||
final FragmentActivity activity = mock(FragmentActivity.class);
|
||||
final Intent intent = new Intent();
|
||||
intent.putExtra(Settings.EXTRA_NETWORK_TEMPLATE, mock(NetworkTemplate.class));
|
||||
intent.putExtra(Settings.EXTRA_SUB_ID, 3);
|
||||
|
@@ -59,6 +59,7 @@ import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@@ -97,7 +98,7 @@ public class DataUsageSummaryPreferenceControllerTest {
|
||||
private DataUsageInfoController mDataInfoController;
|
||||
|
||||
private FakeFeatureFactory mFactory;
|
||||
private Activity mActivity;
|
||||
private FragmentActivity mActivity;
|
||||
private Context mContext;
|
||||
private DataUsageSummaryPreferenceController mController;
|
||||
|
||||
@@ -115,7 +116,7 @@ public class DataUsageSummaryPreferenceControllerTest {
|
||||
ShadowEntityHeaderController.setUseMock(mHeaderController);
|
||||
mDataInfoController = new DataUsageInfoController();
|
||||
|
||||
mActivity = spy(Robolectric.buildActivity(Activity.class).get());
|
||||
mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
|
||||
when(mActivity.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
|
||||
when(mActivity.getSystemService(ConnectivityManager.class))
|
||||
.thenReturn(mConnectivityManager);
|
||||
|
@@ -55,6 +55,7 @@ import org.robolectric.shadows.ShadowActivity;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.preference.PreferenceViewHolder;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@@ -417,7 +418,7 @@ public class DataUsageSummaryPreferenceTest {
|
||||
|
||||
@Test
|
||||
public void testSetAppIntent_toMdpApp_intentCorrect() {
|
||||
final Activity activity = Robolectric.setupActivity(Activity.class);
|
||||
final FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
|
||||
final Intent intent = new Intent(SubscriptionManager.ACTION_MANAGE_SUBSCRIPTION_PLANS);
|
||||
intent.setPackage("test-owner.example.com");
|
||||
intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, 42);
|
||||
@@ -485,7 +486,7 @@ public class DataUsageSummaryPreferenceTest {
|
||||
final int daysLeft = 3;
|
||||
final long cycleEnd = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(daysLeft)
|
||||
+ TimeUnit.HOURS.toMillis(1);
|
||||
final Activity activity = Robolectric.setupActivity(Activity.class);
|
||||
final FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
|
||||
mSummaryPreference = spy(mSummaryPreference);
|
||||
mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
|
||||
new Intent());
|
||||
|
@@ -27,7 +27,6 @@ import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.net.NetworkPolicyManager;
|
||||
|
||||
@@ -48,6 +47,8 @@ import org.robolectric.Robolectric;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
@Config(shadows = {
|
||||
SettingsShadowResourcesImpl.class,
|
||||
SettingsShadowResources.SettingsShadowTheme.class,
|
||||
@@ -63,7 +64,7 @@ public class DataUsageSummaryTest {
|
||||
@Mock
|
||||
private NetworkPolicyManager mNetworkPolicyManager;
|
||||
private Context mContext;
|
||||
private Activity mActivity;
|
||||
private FragmentActivity mActivity;
|
||||
private SummaryLoader.SummaryProvider mSummaryProvider;
|
||||
|
||||
/**
|
||||
@@ -78,7 +79,7 @@ public class DataUsageSummaryTest {
|
||||
shadowContext.setSystemService(Context.NETWORK_POLICY_SERVICE, mNetworkPolicyManager);
|
||||
|
||||
mContext = shadowContext.getApplicationContext();
|
||||
mActivity = spy(Robolectric.buildActivity(Activity.class).get());
|
||||
mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
|
||||
|
||||
mSummaryProvider = DataUsageSummary.SUMMARY_PROVIDER_FACTORY
|
||||
.createSummaryProvider(mActivity, mSummaryLoader);
|
||||
|
Reference in New Issue
Block a user