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

2
tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
View File

@@ -32,7 +32,6 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -60,7 +59,6 @@ public class CameraLaserSensorPreferenceControllerTest {
mController.displayPreference(mScreen);
}
@Ignore
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_withConfigNoShow_shouldReturnFalse() {

2
tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java
View File

@@ -31,7 +31,6 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -100,7 +99,6 @@ public class CoolColorTemperaturePreferenceControllerTest {
verify(mPreference).setChecked(false);
}
@Ignore
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_shouldBeFalse() {

1
tests/robotests/src/com/android/settings/development/DevelopmentMemtagPageTest.java
View File

@@ -24,7 +24,6 @@ import android.content.Context;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;

2
tests/robotests/src/com/android/settings/development/DevelopmentMemtagPreferenceControllerTest.java
View File

@@ -38,7 +38,6 @@ import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.testutils.shadow.ShadowInteractionJankMonitor;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -47,7 +46,6 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowSystemProperties;
@Ignore
@RunWith(RobolectricTestRunner.class)
@Config(
shadows = {

4
tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
View File

@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import com.android.settings.R;
import com.android.settings.utils.ActivityControllerWrapper;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -35,8 +34,7 @@ public class DevelopmentSettingsDisabledActivityTest {
@Test
public void launchActivity_shouldShowToast() {
ActivityControllerWrapper.setup(
Robolectric.buildActivity(DevelopmentSettingsDisabledActivity.class)).get();
Robolectric.setupActivity(DevelopmentSettingsDisabledActivity.class);
final Context context = RuntimeEnvironment.application;
assertThat(ShadowToast.getTextOfLatestToast())

2
tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java
View File

@@ -27,7 +27,6 @@ import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -60,7 +59,6 @@ public class RebootWithMtePreferenceControllerTest {
assertFalse(mController.isAvailable());
}
@Ignore
@Test
public void onAvailable_sysPropEnabled() {
SystemProperties.set("ro.arm64.memtag.bootctl_supported", "1");