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/language/LanguageAndInputSettingsTest.java
View File

@@ -45,7 +45,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
@@ -115,7 +114,6 @@ public class LanguageAndInputSettingsTest {
assertThat(controllers.isEmpty()).isFalse();
}
@Ignore
@Test
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = spy(RuntimeEnvironment.application);

2
tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
View File

@@ -31,7 +31,6 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -94,7 +93,6 @@ public class PhoneLanguagePreferenceControllerTest {
.isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
}
@Ignore
@Test
@Config(qualifiers = "mcc999")
public void testIsAvailable_ifDisabled_shouldReturnFalse() {

36
tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java
View File

@@ -23,7 +23,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;
@@ -34,25 +33,24 @@ import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
public class PointerSpeedControllerTest {
private Context mContext;
private PointerSpeedController mController;
private Context mContext;
private PointerSpeedController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
mController = new PointerSpeedController(mContext);
}
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
mController = new PointerSpeedController(mContext);
}
@Test
public void testDeviceAdministrators_byDefault_shouldBeShown() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void testDeviceAdministrators_byDefault_shouldBeShown() {
assertThat(mController.isAvailable()).isTrue();
}
@Ignore
@Test
@Config(qualifiers = "mcc999")
public void testDeviceAdministrators_ifDisabled_shouldNotBeShown() {
assertThat(mController.isAvailable()).isFalse();
}
@Test
@Config(qualifiers = "mcc999")
public void testDeviceAdministrators_ifDisabled_shouldNotBeShown() {
assertThat(mController.isAvailable()).isFalse();
}
}