Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74627789 authored Aug 14, 2023 by Nataniel Borges

Use androidx Flaky annotation for device tests.

Platform_testing flaky annotation is for
host side tests and will be moved, device
tests should use androidx annotation.

(and fix a couple ktlint spacing issues)

Bug: 293837621
Test: presubmit
Change-Id: I91c58dcfbec623a98647ded67dff2e9d7d90d5a4

parent 513dea53

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ChangeActiveActivityFromBubbleTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,11 +17,11 @@
		package com.android.wm.shell.flicker.bubble

		import android.os.SystemClock
		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.Presubmit
		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.device.flicker.legacy.FlickerBuilder
		import android.tools.device.flicker.legacy.LegacyFlickerTest
		import androidx.test.filters.FlakyTest
		import androidx.test.uiautomator.By
		import androidx.test.uiautomator.UiObject2
		import androidx.test.uiautomator.Until

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OpenActivityFromBubbleOnLocksreenTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.wm.shell.flicker.bubble

		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.Postsubmit
		import android.tools.common.traces.component.ComponentNameMatcher
		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
		@@ -24,6 +23,7 @@ import android.tools.device.flicker.legacy.FlickerBuilder
		import android.tools.device.flicker.legacy.LegacyFlickerTest
		import android.view.WindowInsets
		import android.view.WindowManager
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import androidx.test.uiautomator.By
		import androidx.test.uiautomator.Until

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt

+1 −1

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

		package com.android.wm.shell.flicker.pip

		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.Presubmit
		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.device.flicker.legacy.FlickerBuilder
		import android.tools.device.flicker.legacy.LegacyFlickerTest
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import org.junit.Assume
		import org.junit.FixMethodOrder

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientation.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.wm.shell.flicker.pip

		import android.app.Activity
		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.tools.common.Rotation
		@@ -28,6 +27,7 @@ import android.tools.device.flicker.legacy.FlickerBuilder
		import android.tools.device.flicker.legacy.LegacyFlickerTest
		import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
		import android.tools.device.helpers.WindowUtils
		import androidx.test.filters.FlakyTest
		import com.android.server.wm.flicker.entireScreenCovered
		import com.android.server.wm.flicker.helpers.FixedOrientationAppHelper
		import com.android.server.wm.flicker.testapp.ActivityOptions.Pip.ACTION_ENTER_PIP

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipDragThenSnapTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.wm.shell.flicker.pip

		import android.graphics.Rect
		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.Presubmit
		import android.tools.common.Rotation
		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
		@@ -25,6 +24,7 @@ import android.tools.device.flicker.legacy.FlickerBuilder
		import android.tools.device.flicker.legacy.LegacyFlickerTest
		import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
		import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.helpers.setRotation
		import com.android.server.wm.flicker.testapp.ActivityOptions