Reenable all tests for SettingsRoboTests
Updating tests in development/ due to ag/27774179
Temporarily ignore tests in UserDetailsSettingsTest due to ag/27785999
Bug: 347125800
Test: atest
Change-Id: Iaed79c3fde80f5b2c31754bef4a93546813444a8
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index a26138c..d6210e7 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -47,38 +47,8 @@
android_robolectric_test {
name: "SettingsRoboTests",
srcs: [
- "src/com/android/settings/*.java",
- "src/com/android/settings/accessibility/**/*.java",
- "src/com/android/settings/accounts/**/*.java",
- "src/com/android/settings/applications/**/*.java",
- "src/com/android/settings/backup/**/*.java",
- "src/com/android/settings/bluetooth/**/*.java",
- "src/com/android/settings/bluetooth/**/*.kt",
- "src/com/android/settings/bugreporthandler/**/*.java",
- "src/com/android/settings/communal/**/*.java",
- "src/com/android/settings/connecteddevice/**/*.java",
- //"src/com/android/settings/core/**/*.java",
- "src/com/android/settings/dashboard/**/*.java",
- "src/com/android/settings/datausage/**/*.java",
- "src/com/android/settings/datetime/**/*.java",
- "src/com/android/settings/deletionhelper/**/*.java",
- //"src/com/android/settings/development/**/*.java",
- "src/com/android/settings/deviceinfo/**/*.java",
- "src/com/android/settings/devicelock/**/*.java",
- "src/com/android/settings/display/**/*.java",
- "src/com/android/settings/dream/**/*.java",
- "src/com/android/settings/emergency/**/*.java",
- "src/com/android/settings/enterprise/**/*.java",
- "src/com/android/settings/flashlight/**/*.java",
- "src/com/android/settings/fuelgauge/**/*.java",
- "src/com/android/settings/gestures/**/*.java",
- //"src/com/android/settings/homepage/**/*.java",
- "src/com/android/settings/inputmethod/**/*.java",
- "src/com/android/settings/network/ShadowServiceManagerExtend.java",
- "src/com/android/settings/notification/modes/**/*.java",
- "src/com/android/settings/password/**/*.java",
- "src/com/android/settings/search/DatabaseIndexingUtils.java",
- "src/com/android/settings/testutils/**/*.java",
+ "src/**/*.java",
+ "src/**/*.kt",
],
// test_suites attribute is not needed. This module will be configured in ATP GCL file.
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceControllerTest.java
index 4ac90a7..7fea1f0 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceControllerTest.java
@@ -18,14 +18,13 @@
import static android.bluetooth.BluetoothStatusCodes.FEATURE_SUPPORTED;
-import static com.android.settings.development.BluetoothLeAudioAllowListPreferenceController
- .BYPASS_LE_AUDIO_ALLOWLIST_PROPERTY;
+import static com.android.settings.development.BluetoothLeAudioAllowListPreferenceController.BYPASS_LE_AUDIO_ALLOWLIST_PROPERTY;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
@@ -48,8 +47,6 @@
@Mock
private PreferenceScreen mPreferenceScreen;
@Mock
- private DevelopmentSettingsDashboardFragment mFragment;
- @Mock
private BluetoothAdapter mBluetoothAdapter;
@Mock
private SwitchPreference mPreference;
@@ -60,7 +57,7 @@
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController = spy(new BluetoothLeAudioAllowListPreferenceController(mContext, mFragment));
+ mController = spy(new BluetoothLeAudioAllowListPreferenceController(mContext));
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
.thenReturn(mPreference);
mController.mBluetoothAdapter = mBluetoothAdapter;
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPagePreferenceControllerTest.java
index 7989682..3837634 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPagePreferenceControllerTest.java
@@ -27,7 +27,6 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@@ -40,8 +39,6 @@
private DevelopmentMemtagPagePreferenceController mController;
private Context mContext;
-
- @Mock private DevelopmentSettingsDashboardFragment mFragment;
private static final String FRAGMENT_TAG = "memtag_page";
@Before
@@ -49,7 +46,7 @@
ShadowSystemProperties.override(mMemtagSupportedProperty, "true");
mContext = RuntimeEnvironment.application;
- mController = new DevelopmentMemtagPagePreferenceController(mContext, mFragment);
+ mController = new DevelopmentMemtagPagePreferenceController(mContext);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
index 874b978..7f27324 100644
--- a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
@@ -222,6 +222,7 @@
}
@Test
+ @Ignore("b/313530297")
public void onResume_canSwitch_shouldEnableSwitchPref() {
mUserManager.setSwitchabilityStatus(SWITCHABILITY_STATUS_OK);
mFragment.mSwitchUserPref = mSwitchUserPref;
@@ -233,6 +234,7 @@
}
@Test
+ @Ignore("b/313530297")
public void onResume_userInCall_shouldDisableSwitchPref() {
mUserManager.setSwitchabilityStatus(SWITCHABILITY_STATUS_USER_IN_CALL);
mFragment.mSwitchUserPref = mSwitchUserPref;
@@ -244,6 +246,7 @@
}
@Test
+ @Ignore("b/313530297")
public void onResume_switchDisallowed_shouldDisableSwitchPref() {
mUserManager.setSwitchabilityStatus(SWITCHABILITY_STATUS_USER_SWITCH_DISALLOWED);
mFragment.mSwitchUserPref = mSwitchUserPref;
@@ -255,6 +258,7 @@
}
@Test
+ @Ignore("b/313530297")
public void onResume_systemUserLocked_shouldDisableSwitchPref() {
mUserManager.setSwitchabilityStatus(UserManager.SWITCHABILITY_STATUS_SYSTEM_USER_LOCKED);
mFragment.mSwitchUserPref = mSwitchUserPref;