Merge "Changed statusbar tests to support Robolectric" into main (4db384d6) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+46 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,52 @@ filegroup {
		"tests/src/**/systemui/util/sensors/AsyncManagerTest.java",
		"tests/src/**/systemui/util/sensors/ThresholdSensorImplTest.java",
		"tests/src/**/systemui/util/wakelock/KeepAwakeAnimationListenerTest.java",
		"tests/src/**/systemui/statusbar/KeyboardShortcutListSearchTest.java",
		"tests/src/**/systemui/statusbar/KeyboardShortcutsTest.java",
		"tests/src/**/systemui/statusbar/KeyguardIndicationControllerWithCoroutinesTest.kt",
		"tests/src/**/systemui/statusbar/notification/AssistantFeedbackControllerTest.java",
		"tests/src/**/systemui/statusbar/notification/collection/NotifCollectionTest.java",
		"tests/src/**/systemui/statusbar/notification/collection/NotificationEntryTest.java",
		"tests/src/**/systemui/statusbar/notification/collection/render/GroupExpansionManagerTest.kt",
		"tests/src/**/systemui/statusbar/notification/collection/ShadeListBuilderTest.java",
		"tests/src/**/systemui/statusbar/notification/footer/ui/view/FooterViewTest.java",
		"tests/src/**/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImplTest.java",
		"tests/src/**/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderWrapperTest.kt",
		"tests/src/**/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImplTest.kt",
		"tests/src/**/systemui/statusbar/NotificationLockscreenUserManagerTest.java",
		"tests/src/**/systemui/statusbar/notification/logging/NotificationLoggerTest.java",
		"tests/src/**/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java",
		"tests/src/**/systemui/statusbar/notification/row/NotificationContentInflaterTest.java",
		"tests/src/**/systemui/statusbar/notification/row/NotificationContentViewTest.kt",
		"tests/src/**/systemui/statusbar/notification/row/NotificationConversationInfoTest.java",
		"tests/src/**/systemui/statusbar/notification/row/NotificationGutsManagerTest.java",
		"tests/src/**/systemui/statusbar/notification/row/NotificationGutsManagerWithScenesTest.kt",
		"tests/src/**/systemui/statusbar/notification/row/NotifLayoutInflaterFactoryTest.kt",
		"tests/src/**/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapperTest.kt",
		"tests/src/**/systemui/statusbar/notification/stack/NotificationSectionsManagerTest.java",
		"tests/src/**/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java",
		"tests/src/**/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt",
		"tests/src/**/systemui/statusbar/phone/AutoTileManagerTest.java",
		"tests/src/**/systemui/statusbar/phone/CentralSurfacesImplTest.java",
		"tests/src/**/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java",
		"tests/src/**/systemui/statusbar/phone/PhoneStatusBarTransitionsTest.kt",
		"tests/src/**/systemui/statusbar/phone/PhoneStatusBarViewControllerTest.kt",
		"tests/src/**/systemui/statusbar/phone/PhoneStatusBarView.java",
		"tests/src/**/systemui/statusbar/phone/PhoneStatusBarViewTest.kt",
		"tests/src/**/systemui/statusbar/phone/StatusBarBoundsProviderTest.kt",
		"tests/src/**/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationControllerTest.kt",
		"tests/src/**/systemui/statusbar/pipeline/airplane/ui/viewmodel/AirplaneModeViewModelImplTest.kt",
		"tests/src/**/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryTest.kt",
		"tests/src/**/systemui/statusbar/pipeline/mobile/ui/view/ModernStatusBarMobileViewTest.kt",
		"tests/src/**/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt",
		"tests/src/**/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt",
		"tests/src/**/systemui/statusbar/policy/CallbackControllerTest.java",
		"tests/src/**/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java",
		"tests/src/**/systemui/statusbar/policy/InflatedSmartRepliesTest.java",
		"tests/src/**/systemui/statusbar/policy/LocationControllerImplTest.java",
		"tests/src/**/systemui/statusbar/policy/RemoteInputViewTest.java",
		"tests/src/**/systemui/statusbar/policy/SmartReplyViewTest.java",
		"tests/src/**/systemui/statusbar/StatusBarStateControllerImplTest.kt",
		],
		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/DragDownHelperTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@

		package com.android.systemui.statusbar

		import android.testing.AndroidTestingRunner
		import android.testing.TestableLooper
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.ExpandHelper
		import com.android.systemui.SysuiTestCase
		@@ -39,7 +39,7 @@ import org.mockito.Mockito.`when` as whenever

		@SmallTest
		@TestableLooper.RunWithLooper
		@RunWith(AndroidTestingRunner::class)
		@RunWith(AndroidJUnit4::class)
		class DragDownHelperTest : SysuiTestCase() {

		private lateinit var dragDownHelper: DragDownHelper

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -65,9 +65,9 @@ import android.hardware.biometrics.BiometricFingerprintConstants;
		import android.hardware.biometrics.BiometricSourceType;
		import android.os.BatteryManager;
		import android.os.RemoteException;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;

		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.FlakyTest;
		import androidx.test.filters.SmallTest;

		@@ -88,7 +88,7 @@ import java.util.List;
		import java.util.Set;

		@SmallTest
		@RunWith(AndroidTestingRunner.class)
		@RunWith(AndroidJUnit4.class)
		@TestableLooper.RunWithLooper
		public class KeyguardIndicationControllerTest extends KeyguardIndicationControllerBaseTest {
		@Test

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerWithCoroutinesTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@

		package com.android.systemui.statusbar

		import android.testing.AndroidTestingRunner
		import android.testing.TestableLooper
		import android.view.View
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.flags.Flags.LOCKSCREEN_WALLPAPER_DREAM_ENABLED
		import kotlinx.coroutines.Dispatchers
		@@ -28,7 +28,7 @@ import org.junit.runner.RunWith
		import org.mockito.Mockito.times
		import org.mockito.Mockito.verify

		@RunWith(AndroidTestingRunner::class)
		@RunWith(AndroidJUnit4::class)
		@SmallTest
		@TestableLooper.RunWithLooper(setAsMainLooper = true)
		class KeyguardIndicationControllerWithCoroutinesTest : KeyguardIndicationControllerBaseTest() {

packages/SystemUI/tests/src/com/android/systemui/statusbar/LSShadeTransitionLoggerTest.kt

+3 −3

Original line number	Diff line number	Diff line
		package com.android.systemui.statusbar

		import android.testing.AndroidTestingRunner
		import android.util.DisplayMetrics
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.log.LogBuffer
		@@ -16,7 +16,7 @@ import org.junit.runner.RunWith
		import org.mockito.Mock
		import org.mockito.junit.MockitoJUnit

		@RunWith(AndroidTestingRunner::class)
		@RunWith(AndroidJUnit4::class)
		@SmallTest
		class LSShadeTransitionLoggerTest : SysuiTestCase() {
		lateinit var logger: LSShadeTransitionLogger