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/inputmethod/GameControllerPreferenceControllerTest.java
View File

@@ -32,7 +32,6 @@ import android.hardware.input.InputManager;
import android.view.InputDevice;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
@@ -111,7 +110,6 @@ public class GameControllerPreferenceControllerTest {
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Ignore
@Test
@Config(qualifiers = "mcc999")
public void getAvailabilityStatus_ifDisabled_shouldReturnDisabled() {

4
tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java
View File

@@ -27,7 +27,6 @@ import android.os.Bundle;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
import com.android.settings.utils.ActivityControllerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -49,8 +48,7 @@ public class InputMethodAndSubtypeEnablerTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mActivity = (FragmentActivity) ActivityControllerWrapper.setup(
Robolectric.buildActivity(FragmentActivity.class)).get();
mActivity = Robolectric.setupActivity(FragmentActivity.class);
mFragment = spy(new InputMethodAndSubtypeEnabler());
when(mFragment.getActivity()).thenReturn(mActivity);
}

2
tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java
View File

@@ -39,7 +39,6 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.shadow.ShadowInputDevice;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -50,7 +49,6 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@Ignore
@RunWith(RobolectricTestRunner.class)
public class KeyboardLayoutPickerControllerTest {

2
tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
View File

@@ -34,7 +34,6 @@ import androidx.core.text.BidiFormatter;
import androidx.preference.Preference;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -78,7 +77,6 @@ public class VirtualKeyboardPreferenceControllerTest {
assertThat(mController.isAvailable()).isTrue();
}
@Ignore
@Test
@Config(qualifiers = "mcc999")
public void testVirtualKeyboard_ifDisabled_shouldNotBeShown() {