Merge "Migrate /systemui/smartspace tests to bivalent." into main (4933f3e0) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+6 −0

Original line number	Diff line number	Diff line
		@@ -348,6 +348,12 @@ filegroup {
		"tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java",
		"tests/src/com/android/systemui/dreams/DreamOverlayStatusBarItemsProviderTest.java",
		"tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java",

		/* Smartspace tests */
		"tests/src/com/android/systemui/smartspace/BcSmartspaceConfigProviderTest.kt",
		"tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt",
		"tests/src/com/android/systemui/smartspace/LockscreenAndDreamTargetFilterTest.kt",
		"tests/src/com/android/systemui/smartspace/LockscreenPreconditionTest.kt",
		],
		path: "tests/src",
		}

+4 −2

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

		package com.android.systemui.smartspace

		import android.testing.AndroidTestingRunner
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.RoboPilotTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		@@ -32,7 +33,8 @@ import org.mockito.Mock
		import org.mockito.MockitoAnnotations

		@SmallTest
		@RunWith(AndroidTestingRunner::class)
		@RoboPilotTest
		@RunWith(AndroidJUnit4::class)
		class BcSmartspaceConfigProviderTest : SysuiTestCase() {
		@Mock private lateinit var featureFlags: FeatureFlags

+4 −2

Original line number	Diff line number	Diff line
		@@ -20,12 +20,13 @@ import android.app.smartspace.SmartspaceSession
		import android.app.smartspace.SmartspaceTarget
		import android.content.Context
		import android.graphics.drawable.Drawable
		import android.testing.AndroidTestingRunner
		import android.testing.TestableLooper
		import android.view.View
		import android.view.ViewGroup
		import android.widget.FrameLayout
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.RoboPilotTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.dreams.smartspace.DreamSmartspaceController
		import com.android.systemui.plugins.BcSmartspaceConfigPlugin
		@@ -52,7 +53,8 @@ import org.mockito.MockitoAnnotations
		import org.mockito.Spy

		@SmallTest
		@RunWith(AndroidTestingRunner::class)
		@RoboPilotTest
		@RunWith(AndroidJUnit4::class)
		@TestableLooper.RunWithLooper
		class DreamSmartspaceControllerTest : SysuiTestCase() {
		@Mock

+4 −2

Original line number	Diff line number	Diff line
		@@ -22,9 +22,10 @@ import android.net.Uri
		import android.os.Handler
		import android.os.UserHandle
		import android.provider.Settings
		import android.testing.AndroidTestingRunner
		import android.testing.TestableLooper
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.RoboPilotTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.settings.UserTracker
		import com.android.systemui.smartspace.filters.LockscreenAndDreamTargetFilter
		@@ -51,7 +52,8 @@ import org.mockito.MockitoAnnotations

		@SmallTest
		@TestableLooper.RunWithLooper
		@RunWith(AndroidTestingRunner::class)
		@RoboPilotTest
		@RunWith(AndroidJUnit4::class)
		class LockscreenAndDreamTargetFilterTest : SysuiTestCase() {
		@Mock
		private lateinit var secureSettings: SecureSettings

+4 −2

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

		package com.android.systemui.smartspace

		import android.testing.AndroidTestingRunner
		import android.testing.TestableLooper
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.RoboPilotTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.smartspace.preconditions.LockscreenPrecondition
		import com.android.systemui.statusbar.policy.DeviceProvisionedController
		@@ -35,7 +36,8 @@ import org.mockito.Mockito.verify
		import org.mockito.MockitoAnnotations

		@SmallTest
		@RunWith(AndroidTestingRunner::class)
		@RoboPilotTest
		@RunWith(AndroidJUnit4::class)
		@TestableLooper.RunWithLooper
		class LockscreenPreconditionTest : SysuiTestCase() {
		@Mock