Merge "Disable unsupported tests in SystemUiRavenTests" into main (d9017100) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.content.ComponentName
		import android.graphics.Insets
		import android.graphics.Rect
		import android.os.UserHandle
		import android.platform.test.annotations.DisabledOnRavenwood
		import android.view.Display
		import android.view.WindowManager
		import androidx.test.ext.junit.runners.AndroidJUnit4
		@@ -29,6 +30,7 @@ import org.junit.Test
		import org.junit.runner.RunWith

		@RunWith(AndroidJUnit4::class)
		@DisabledOnRavenwood(blockedBy = [ScreenshotRequest::class])
		class ScreenshotDataTest {
		private val type = WindowManager.TAKE_SCREENSHOT_FULLSCREEN
		private val source = WindowManager.ScreenshotSource.SCREENSHOT_KEY_OTHER

+3 −0

Original line number	Diff line number	Diff line
		@@ -21,11 +21,13 @@ import android.graphics.Insets
		import android.graphics.Rect
		import android.os.UserHandle
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.DisabledOnRavenwood
		import android.platform.test.flag.junit.SetFlagsRule
		import android.view.Display.DEFAULT_DISPLAY
		import android.view.WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD
		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.kosmos.Kosmos
		import com.android.systemui.screenshot.ImageCapture
		@@ -52,6 +54,7 @@ import org.junit.Test
		import org.junit.runner.RunWith

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

+3 −0

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

		package com.android.systemui.screenshot.policy

		import android.app.ActivityTaskManager
		import android.content.ComponentName
		import android.os.UserHandle
		import android.platform.test.annotations.DisabledOnRavenwood
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.screenshot.data.model.DisplayContentModel
		@@ -44,6 +46,7 @@ import org.junit.Test
		import org.junit.runner.RunWith

		@RunWith(AndroidJUnit4::class)
		@DisabledOnRavenwood(blockedBy = [ActivityTaskManager.RootTaskInfo::class])
		class PrivateProfilePolicyTest {
		private val kosmos = Kosmos()
		private val policy = PrivateProfilePolicy(kosmos.profileTypeRepository)

+3 −0

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

		package com.android.systemui.screenshot.policy

		import android.app.ActivityTaskManager
		import android.content.ComponentName
		import android.graphics.Rect
		import android.os.UserHandle
		import android.platform.test.annotations.DisabledOnRavenwood
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.screenshot.data.model.DisplayContentScenarios.ActivityNames.FILES
		@@ -45,6 +47,7 @@ import org.junit.Test
		import org.junit.runner.RunWith

		@RunWith(AndroidJUnit4::class)
		@DisabledOnRavenwood(blockedBy = [ActivityTaskManager.RootTaskInfo::class])
		class ScreenshotPolicyTest {
		private val kosmos = Kosmos()

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,11 +16,13 @@

		package com.android.systemui.screenshot.policy

		import android.app.ActivityTaskManager
		import android.content.ComponentName
		import android.content.Context
		import android.content.res.Resources
		import android.os.UserHandle
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.DisabledOnRavenwood
		import android.platform.test.annotations.EnableFlags
		import android.platform.test.flag.junit.SetFlagsRule
		import androidx.test.ext.junit.runners.AndroidJUnit4
		@@ -62,6 +64,7 @@ import org.mockito.junit.MockitoRule
		import org.mockito.kotlin.whenever

		@RunWith(AndroidJUnit4::class)
		@DisabledOnRavenwood(blockedBy = [ActivityTaskManager.RootTaskInfo::class])
		class WorkProfilePolicyTest {

		@JvmField @Rule(order = 1) val setFlagsRule = SetFlagsRule()