Fix robo test case failed

Bug: 300134365
Test: robotest
Change-Id: I144fbbc962a479c97312cee1645c5a3d70351542
This commit is contained in:
Edgar Wang
2023-09-20 11:45:05 +08:00
parent 5872a8f573
commit 292f407071
18 changed files with 54 additions and 20 deletions

View File

@@ -23,6 +23,7 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.Bundle;
import androidx.fragment.app.FragmentActivity;
@@ -38,6 +39,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@@ -53,7 +55,7 @@ public class InstrumentedPreferenceFragmentTest {
private PreferenceManager mPreferenceManager;
@Mock
private FragmentActivity mActivity;
private Context mContext;
private InstrumentedPreferenceFragmentTestable mFragment;
@Before
@@ -61,7 +63,9 @@ public class InstrumentedPreferenceFragmentTest {
MockitoAnnotations.initMocks(this);
when(mPreferenceManager.getPreferenceScreen()).thenReturn(mScreen);
mContext = RuntimeEnvironment.application;
mFragment = spy(new InstrumentedPreferenceFragmentTestable());
when(mFragment.getContext()).thenReturn(mContext);
ReflectionHelpers.setField(mFragment, "mPreferenceManager", mPreferenceManager);
}

View File

@@ -36,7 +36,6 @@ import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class TimePreferenceControllerTest {
@Mock
private Context mContext;
@Mock
private TimePreferenceController.TimePreferenceHost mHost;
@@ -49,6 +48,7 @@ public class TimePreferenceControllerTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mPreference = new RestrictedPreference(RuntimeEnvironment.application);
mController = new TimePreferenceController(mContext, mHost, mDatePreferenceController);
}

View File

@@ -26,6 +26,8 @@ import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -52,6 +54,7 @@ public class RebootWithMtePreferenceControllerTest {
mContext = ApplicationProvider.getApplicationContext();
mController = new RebootWithMtePreferenceController(mContext);
mController.setFragment(mFragment);
DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mContext, true);
}
@Test

View File

@@ -42,6 +42,7 @@ import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.ResolveInfoBuilder;
import com.android.settings.testutils.shadow.ShadowDeviceStateRotationLockSettingsManager;
import com.android.settings.testutils.shadow.ShadowSensorPrivacyManager;
import com.android.settings.testutils.shadow.ShadowSystemSettings;
import org.junit.Before;
import org.junit.Test;
@@ -55,6 +56,7 @@ import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
ShadowSystemSettings.class,
ShadowSensorPrivacyManager.class,
ShadowDeviceStateRotationLockSettingsManager.class
})

View File

@@ -145,7 +145,7 @@ public class ContextualCardLoaderTest {
@Test
public void getCardCount_hasConfiguredCardCount_returnConfiguredCardCount() {
int configCount = 4;
Settings.Global.putLong(mContext.getContentResolver(),
Settings.Global.putInt(mContext.getContentResolver(),
ContextualCardLoader.CONTEXTUAL_CARD_COUNT, configCount);
assertThat(mContextualCardLoader.getCardCount()).isEqualTo(configCount);

View File

@@ -47,7 +47,10 @@ import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowInputMethodManagerWithMethodList.class)
@Config(shadows = {
ShadowInputMethodManagerWithMethodList.class,
com.android.settings.testutils.shadow.ShadowFragment.class,
})
public class InputMethodAndSubtypePreferenceControllerTest {
@Mock

View File

@@ -50,6 +50,9 @@ import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
})
public class KeyboardLayoutPickerControllerTest {
@Mock

View File

@@ -80,7 +80,8 @@ import java.util.List;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
// ShadowUserManager.class,
ShadowUserManager.class,
com.android.settings.testutils.shadow.ShadowFragment.class,
ShadowDevicePolicyManager.class
})
public class UserDetailsSettingsTest {

View File

@@ -29,8 +29,13 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
})
public class AppDialogFragmentTest {
@Mock

View File

@@ -66,6 +66,7 @@ import java.util.Collections;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
ShadowUserManager.class,
com.android.settings.testutils.shadow.ShadowFragment.class,
})
public class WebViewAppPickerTest {

View File

@@ -52,8 +52,12 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
})
public class EntityHeaderControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)

View File

@@ -53,9 +53,13 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
})
public class HighlightablePreferenceGroupAdapterTest {
private static final String TEST_KEY = "key";

View File

@@ -22,12 +22,9 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.view.View;
import android.widget.ImageView;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -58,17 +55,6 @@ public class SettingsMainSwitchPreferenceTest {
mHolder = PreferenceViewHolder.createInstanceForTests(rootView);
}
@Test
public void onBindViewHolder_isRestricted_restrictIconShouldDisplay() {
mPreference.onBindViewHolder(mHolder);
final SettingsMainSwitchBar switchBar = mPreference.getSwitchBar();
final ImageView restrictedIcon = switchBar.findViewById(
com.android.settingslib.widget.restricted.R.id.restricted_icon);
assertThat(restrictedIcon.getVisibility() == View.VISIBLE).isTrue();
}
@Test
public void show_preferenceShouldDisplay() {
mPreference.show();

View File

@@ -45,6 +45,9 @@ import org.robolectric.annotation.Implements;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
})
public class ConfigureWifiSettingsTest {
@Rule

View File

@@ -47,8 +47,12 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
})
public class WifiScanningRequiredFragmentTest {
private WifiScanningRequiredFragment mFragment;

View File

@@ -55,12 +55,16 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.androidx.fragment.FragmentController;
import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
})
public class AddAppNetworksFragmentTest {
private static final String FAKE_APP_NAME = "fake_app_name";

View File

@@ -120,7 +120,10 @@ import java.util.stream.Collectors;
// TODO(b/143326832): Should add test cases for connect button.
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowDevicePolicyManager.class, ShadowEntityHeaderController.class})
@Config(shadows = {
ShadowDevicePolicyManager.class,
com.android.settings.testutils.shadow.ShadowFragment.class,
ShadowEntityHeaderController.class})
public class WifiDetailPreferenceController2Test {
private static final int LEVEL = 1;

View File

@@ -43,10 +43,14 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import java.util.Arrays;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
})
public class WifiDppQrCodeScannerFragmentTest {
static final String WIFI_SSID = "wifi-ssid";