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

Revert "Test Fix SettingRobolectricTest Fail"

Browse Source 
This reverts commit 818f77cd1f.

Reason for revert: Underlying issue fixed in ag/23454315.

Bug: b/275023433
Test: atest SettingsGlobalRoboTests

Change-Id: I1af272efd00b3c5bd35310512f5712d5d1c7d834
This commit is contained in:
Eric Rahm
2023-07-13 12:05:20 +00:00
parent 7cd9300c1d
commit 802b922593
142 changed files with 130 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
View File

@@ -36,7 +36,6 @@ import com.android.internal.R;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -140,7 +139,6 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest {
assertThat(controller.isSliceable()).isTrue();
}
@Ignore
@Test
public void isSliceableIncorrectKey_returnsFalse() {
final AmbientDisplayAlwaysOnPreferenceController controller =
@@ -148,7 +146,6 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest {
assertThat(controller.isSliceable()).isFalse();
}
@Ignore
@Test
public void isPublicSlice_returnTrue() {
assertThat(mController.isPublicSlice()).isTrue();

5
tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
View File

@@ -40,7 +40,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.utils.ActivityControllerWrapper;
import com.android.settingslib.transition.SettingsTransitionHelper;
import org.junit.Before;
@@ -166,9 +165,7 @@ public class BrightnessLevelPreferenceControllerTest {
@Test
public void handlePreferenceTreeClick_transitionTypeNone_shouldPassToNextActivity() {
final Activity activity = (Activity) ActivityControllerWrapper.setup(
Robolectric.buildActivity(Activity.class)).get();
final Activity activity = Robolectric.setupActivity(Activity.class);
final BrightnessLevelPreferenceController controller =
new BrightnessLevelPreferenceController(activity, null);
final ShadowActivity shadowActivity = shadowOf(activity);

3
tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java
View File

@@ -44,7 +44,6 @@ import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -147,7 +146,6 @@ public class ControlsTrivialPrivacyPreferenceControllerTest {
verify(mPreference, atLeastOnce()).setSummary(mController.getSummary());
}
@Ignore
@Test
public void updateStateWithCustomizableLockScreenQuickAffordancesEnabled() {
setCustomizableLockScreenQuickAffordancesEnabled(true);
@@ -168,7 +166,6 @@ public class ControlsTrivialPrivacyPreferenceControllerTest {
BasePreferenceController.DISABLED_DEPENDENT_SETTING);
}
@Ignore
@Test
public void getAvailabilityStatusWithCustomizableLockScreenQuickAffordancesEnabled() {
setCustomizableLockScreenQuickAffordancesEnabled(true);

2
tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java
View File

@@ -50,7 +50,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -177,7 +176,6 @@ public class SmartAutoRotatePreferenceFragmentTest {
assertThat(preferenceControllers).isEmpty();
}
@Ignore
@Test
public void createPreferenceControllers_settableDeviceStates_returnsDeviceStateControllers() {
enableDeviceStateSettableRotationStates(new String[]{"0:1", "1:1"},

2
tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
View File

@@ -26,7 +26,6 @@ import static org.mockito.Mockito.spy;
import android.content.Context;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
@@ -51,7 +50,6 @@ public class TopLevelDisplayPreferenceControllerTest {
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Ignore
@Test
@Config(qualifiers = "mcc999")
public void getAvailabilityStatus_unsupportedWhenSet() {