diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java index f3d85d3993a..59aea3de99c 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java @@ -324,7 +324,7 @@ public class AppButtonsPreferenceControllerTest { final boolean controllable = mController.handleDisableable(); - verify(mButtonPrefs).setButton2Text(R.string.uninstall_text); + verify(mButtonPrefs).setButton2Text(R.string.disable_text); assertThat(controllable).isFalse(); } @@ -336,7 +336,7 @@ public class AppButtonsPreferenceControllerTest { final boolean controllable = mController.handleDisableable(); - verify(mButtonPrefs).setButton2Text(R.string.uninstall_text); + verify(mButtonPrefs).setButton2Text(R.string.disable_text); assertThat(controllable).isTrue(); } @@ -348,7 +348,7 @@ public class AppButtonsPreferenceControllerTest { final boolean controllable = mController.handleDisableable(); - verify(mButtonPrefs).setButton2Text(R.string.install_text); + verify(mButtonPrefs).setButton2Text(R.string.enable_text); assertThat(controllable).isTrue(); } diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java index ca993612ac0..fdbf8b93319 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java @@ -16,43 +16,26 @@ package com.android.settings.applications.appinfo; -import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; - -import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.settings.SettingsEnums; -import android.view.Window; import android.view.WindowManager.LayoutParams; -import androidx.fragment.app.FragmentActivity; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.shadow.ShadowAppInfoBase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) public class DrawOverlayDetailsTest { - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private FragmentActivity mActivity; - - @Mock - private Window mWindow; - private LayoutParams layoutParams; private FakeFeatureFactory mFeatureFactory; @@ -82,23 +65,4 @@ public class DrawOverlayDetailsTest { MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_DENY, mFragment.getMetricsCategory(), "app", 0); } - - @Test - @Config(shadows = {ShadowAppInfoBase.class}) - public void hideNonSystemOverlaysWhenResumed() { - when(mFragment.getActivity()).thenReturn(mActivity); - when(mActivity.getWindow()).thenReturn(mWindow); - when(mWindow.getAttributes()).thenReturn(layoutParams); - - mFragment.onResume(); - verify(mWindow).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); - - mFragment.onPause(); - - // There's no Window.clearPrivateFlags() method, so the Window.attributes are updated. - ArgumentCaptor paramCaptor = ArgumentCaptor.forClass(LayoutParams.class); - verify(mWindow).setAttributes(paramCaptor.capture()); - assertEquals(0, - paramCaptor.getValue().privateFlags & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); - } } diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java index ab3f4de26f9..c5519601ae7 100644 --- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java +++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java @@ -45,6 +45,7 @@ import com.android.settingslib.media.MediaDevice; import com.android.settingslib.media.MediaOutputSliceConstants; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -59,6 +60,7 @@ import java.util.List; @RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) +@Ignore("b/129292771") public class MediaOutputIndicatorSliceTest { private static final String TEST_DEVICE_NAME = "test_device_name"; diff --git a/tests/robotests/src/com/android/settings/notification/AppNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/AppNotificationSettingsTest.java deleted file mode 100644 index 9555a56e1ba..00000000000 --- a/tests/robotests/src/com/android/settings/notification/AppNotificationSettingsTest.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.android.settings.notification; - -import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; - -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.view.Window; -import android.view.WindowManager; - -import androidx.fragment.app.FragmentActivity; -import androidx.fragment.app.FragmentManager; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@RunWith(RobolectricTestRunner.class) -public class AppNotificationSettingsTest { - - private WindowManager.LayoutParams mLayoutParams; - private AppNotificationSettings mFragment; - private FragmentActivity mActivity; - @Mock - private Window mWindow; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mLayoutParams = new WindowManager.LayoutParams(); - mActivity = spy(Robolectric.setupActivity(FragmentActivity.class)); - mFragment = spy(new AppNotificationSettings()); - when(mFragment.getActivity()).thenReturn(mActivity); - when(mFragment.getFragmentManager()).thenReturn(mock(FragmentManager.class)); - when(mActivity.getWindow()).thenReturn(mWindow); - when(mWindow.getAttributes()).thenReturn(mLayoutParams); - } - - @Test - @Config(shadows = {ShadowNotificationSettingsBase.class}) - public void onResume_shouldHideSystemOverlay() { - mFragment.onResume(); - - verify(mWindow).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); - } - - @Test - @Config(shadows = {ShadowNotificationSettingsBase.class}) - public void onPause_shouldRemoveHideSystemOverlay() { - mFragment.onResume(); - - verify(mWindow).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); - - mFragment.onPause(); - - // There's no Window.clearPrivateFlags() method, so the Window.attributes are updated. - ArgumentCaptor paramCaptor = ArgumentCaptor.forClass( - WindowManager.LayoutParams.class); - verify(mWindow).setAttributes(paramCaptor.capture()); - assertEquals(0, - paramCaptor.getValue().privateFlags - & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); - } - - @Implements(NotificationSettingsBase.class) - public static class ShadowNotificationSettingsBase { - - protected void __constructor__() { - // Do nothing - } - - @Implementation - protected void onResume() { - // No-op. - } - - @Implementation - protected void onPause() { - // No-op. - } - } -} diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java index 6c221e797f9..25fa737b591 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java @@ -35,6 +35,7 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.Button; +import androidx.fragment.app.FragmentActivity; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.OnScrollListener; @@ -60,7 +61,7 @@ import org.robolectric.RobolectricTestRunner; public class WifiCallingDisclaimerFragmentTest { @Mock - private Activity mActivity; + private FragmentActivity mActivity; @Mock private DisclaimerItem mDisclaimerItem; @Mock @@ -89,7 +90,7 @@ public class WifiCallingDisclaimerFragmentTest { public void setUp() { MockitoAnnotations.initMocks(this); - mActivity = Robolectric.setupActivity(Activity.class); + mActivity = Robolectric.setupActivity(FragmentActivity.class); mFragment = spy(new WifiCallingDisclaimerFragment()); doReturn(mActivity).when(mFragment).getActivity(); diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index 574d0d651cc..947d6187b28 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -77,6 +77,7 @@ import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.wifi.AccessPoint; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -98,6 +99,7 @@ import java.util.stream.Collectors; @RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowDevicePolicyManager.class, ShadowEntityHeaderController.class}) +@Ignore("b/129292549") public class WifiDetailPreferenceControllerTest { private static final int LEVEL = 1; diff --git a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java index 75a9e117739..60558dcb8fb 100644 --- a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java @@ -54,6 +54,7 @@ import com.android.settings.testutils.SliceTester; import com.android.settingslib.wifi.AccessPoint; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -161,6 +162,7 @@ public class WifiSliceTest { @Test @Config(shadows = ShadowSliceBackgroundWorker.class) + @Ignore("b/129293669") public void getWifiSlice_noReachableAp_shouldReturnLoadingRow() { setWorkerResults( createAccessPoint(AP1_NAME, false, false), @@ -178,6 +180,7 @@ public class WifiSliceTest { @Test @Config(shadows = ShadowSliceBackgroundWorker.class) + @Ignore("b/129293669") public void getWifiSlice_oneActiveAp_shouldReturnLoadingRow() { setWorkerResults(createAccessPoint(AP1_NAME, true, true)); final Slice wifiSlice = mWifiSlice.getSlice(); @@ -192,6 +195,7 @@ public class WifiSliceTest { @Test @Config(shadows = ShadowSliceBackgroundWorker.class) + @Ignore("b/129293669") public void getWifiSlice_oneActiveApAndOneUnreachableAp_shouldReturnLoadingRow() { setWorkerResults( createAccessPoint(AP1_NAME, true, true), @@ -209,6 +213,7 @@ public class WifiSliceTest { @Test @Config(shadows = ShadowSliceBackgroundWorker.class) + @Ignore("b/129293669") public void getWifiSlice_oneReachableAp_shouldNotReturnLoadingRow() { setWorkerResults(createAccessPoint(AP1_NAME, false, true)); final Slice wifiSlice = mWifiSlice.getSlice(); @@ -223,6 +228,7 @@ public class WifiSliceTest { @Test @Config(shadows = ShadowSliceBackgroundWorker.class) + @Ignore("b/129293669") public void getWifiSlice_allReachableAps_shouldNotReturnLoadingRow() { setWorkerResults( createAccessPoint(AP1_NAME, false, true),