Merge "Make all screenshot tests inherit from SysuiTestCase" into main (ee700ffe) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/AnnouncementResolverTest.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.systemui.screenshot

		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.screenshot.data.repository.profileTypeRepository
		import com.android.systemui.screenshot.policy.TestUserIds
		@@ -31,7 +32,7 @@ import org.junit.runner.RunWith
		import org.mockito.Mockito.mock

		@RunWith(AndroidJUnit4::class)
		class AnnouncementResolverTest {
		class AnnouncementResolverTest : SysuiTestCase() {
		private val kosmos = Kosmos()

		private val screenshotMessage = "Saving screenshot"
		@@ -49,7 +50,7 @@ class AnnouncementResolverTest {
		AnnouncementResolver(
		messages,
		kosmos.profileTypeRepository,
		TestScope(UnconfinedTestDispatcher())
		TestScope(UnconfinedTestDispatcher()),
		)

		@Test

+2 −1

Original line number	Diff line number	Diff line
		@@ -25,13 +25,14 @@ import android.view.Display
		import android.view.WindowManager
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.internal.util.ScreenshotRequest
		import com.android.systemui.SysuiTestCase
		import com.google.common.truth.Truth.assertThat
		import org.junit.Test
		import org.junit.runner.RunWith

		@RunWith(AndroidJUnit4::class)
		@DisabledOnRavenwood(blockedBy = [ScreenshotRequest::class])
		class ScreenshotDataTest {
		class ScreenshotDataTest : SysuiTestCase() {
		private val type = WindowManager.TAKE_SCREENSHOT_FULLSCREEN
		private val source = WindowManager.ScreenshotSource.SCREENSHOT_KEY_OTHER
		private val bounds = Rect(1, 2, 3, 4)

+2 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.view.IWindowManager
		import android.view.WindowManager
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.util.mockito.any
		import com.android.systemui.util.mockito.argThat
		import com.android.systemui.util.mockito.eq
		@@ -44,7 +45,7 @@ import org.mockito.MockitoAnnotations

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class ScreenshotDetectionControllerTest {
		class ScreenshotDetectionControllerTest : SysuiTestCase() {

		@Mock lateinit var windowManager: IWindowManager

+5 −4

Original line number	Diff line number	Diff line
		@@ -17,12 +17,13 @@
		package com.android.systemui.screenshot.message

		import android.content.ComponentName
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import android.content.pm.PackageManager
		import android.graphics.Canvas
		import android.graphics.ColorFilter
		import android.graphics.drawable.Drawable
		import android.os.UserHandle
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.screenshot.data.model.ProfileType
		import com.android.systemui.screenshot.data.repository.ProfileTypeRepository
		import com.google.common.truth.Truth.assertThat
		@@ -31,7 +32,7 @@ import org.junit.Test
		import org.junit.runner.RunWith

		@RunWith(AndroidJUnit4::class)
		class ProfileMessageControllerTest {
		class ProfileMessageControllerTest : SysuiTestCase() {
		@Test
		fun personalScreenshot() = runTest {
		assertThat(
		@@ -111,7 +112,7 @@ class ProfileMessageControllerTest {
		object : PackageLabelIconProvider {
		override suspend fun getPackageLabelIcon(
		componentName: ComponentName,
		userHandle: UserHandle
		userHandle: UserHandle,
		): LabeledIcon {
		if (componentName.equals(FILE_MANAGER_COMPONENT)) {
		return LabeledIcon(FILE_MANAGER_LABEL, drawable)
		@@ -173,7 +174,7 @@ class ProfileMessageControllerTest {
		packageLabelIconProvider,
		FakeProfileFirstRunResources(fileManagerComponent),
		profileFirstRunSettings,
		profileTypeRepository
		profileTypeRepository,
		)

		companion object {

+2 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.view.WindowManager.TAKE_SCREENSHOT_FULLSCREEN
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.internal.util.ScreenshotRequest
		import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.screenshot.ImageCapture
		import com.android.systemui.screenshot.ScreenshotData
		@@ -55,7 +56,7 @@ import org.junit.runner.RunWith

		@RunWith(AndroidJUnit4::class)
		@DisabledOnRavenwood(blockedBy = [ScreenshotRequest::class])
		class PolicyRequestProcessorTest {
		class PolicyRequestProcessorTest : SysuiTestCase() {
		private val kosmos = Kosmos()

		private val screenshotRequest =