3/ Update flicker tests to compatibilize with new apps (816c9464) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,6 +48,6 @@ android_test {
		"wm-flicker-common-assertions",
		"wm-flicker-common-app-helpers",
		"platform-test-annotations",
		"wmshell-flicker-test-components",
		"flickertestapplib",
		],
		}

libs/WindowManager/Shell/tests/flicker/AndroidTest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
		<option name="cleanup-apks" value="true"/>
		<option name="test-file-name" value="WMShellFlickerTests.apk"/>
		<option name="test-file-name" value="WMShellFlickerTestApp.apk" />
		<option name="test-file-name" value="FlickerTestApp.apk" />
		</target_preparer>
		<test class="com.android.tradefed.testtype.AndroidJUnitTest">
		<option name="package" value="com.android.wm.shell.flicker"/>

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.wm.shell.flicker.bubble
		import android.app.INotificationManager
		import android.app.NotificationManager
		import android.content.Context
		import android.content.pm.PackageManager
		import android.os.ServiceManager
		import android.view.Surface
		import androidx.test.uiautomator.By
		@@ -28,9 +29,9 @@ import com.android.server.wm.flicker.Flicker
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.LaunchBubbleHelper
		import com.android.server.wm.flicker.helpers.SYSTEMUI_PACKAGE
		import com.android.wm.shell.flicker.BaseTest
		import com.android.wm.shell.flicker.helpers.LaunchBubbleHelper
		import org.junit.runners.Parameterized

		/**
		@@ -47,7 +48,7 @@ abstract class BaseBubbleScreen(
		ServiceManager.getService(Context.NOTIFICATION_SERVICE))

		private val uid = context.packageManager.getApplicationInfo(
		testApp.`package`, 0).uid
		testApp.`package`, PackageManager.ApplicationInfoFlags.of(0)).uid

		@JvmOverloads
		protected open fun buildTransition(

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

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		@file:JvmName("CommonAssertions")
		package com.android.wm.shell.flicker.pip

		internal const val PIP_WINDOW_COMPONENT = "PipMenuActivity"

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -28,16 +28,17 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.Group3
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.entireScreenCovered
		import com.android.server.wm.flicker.helpers.FixedOrientationAppHelper
		import com.android.server.wm.flicker.helpers.WindowUtils
		import com.android.server.wm.flicker.helpers.setRotation
		import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
		import com.android.server.wm.flicker.navBarLayerPositionAtStartAndEnd
		import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule
		import com.android.wm.shell.flicker.helpers.FixedAppHelper
		import com.android.server.wm.flicker.testapp.ActivityOptions.Pip.ACTION_ENTER_PIP
		import com.android.server.wm.flicker.testapp.ActivityOptions.PortraitOnlyActivity.EXTRA_FIXED_ORIENTATION
		import com.android.server.wm.traces.common.ComponentNameMatcher
		import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_LANDSCAPE
		import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_PORTRAIT
		import com.android.wm.shell.flicker.testapp.Components.FixedActivity.EXTRA_FIXED_ORIENTATION
		import com.android.wm.shell.flicker.testapp.Components.PipActivity.ACTION_ENTER_PIP
		import org.junit.Assume
		import org.junit.Before
		import org.junit.FixMethodOrder
		@@ -72,7 +73,7 @@ import org.junit.runners.Parameterized
		class EnterPipToOtherOrientationTest(
		testSpec: FlickerTestParameter
		) : PipTransition(testSpec) {
		private val testApp = FixedAppHelper(instrumentation)
		private val testApp = FixedOrientationAppHelper(instrumentation)
		private val startingBounds = WindowUtils.getDisplayBounds(Surface.ROTATION_90)
		private val endingBounds = WindowUtils.getDisplayBounds(Surface.ROTATION_0)

		@@ -127,7 +128,7 @@ class EnterPipToOtherOrientationTest(
		}

		/**
		* Checks that the [ComponentMatcher.NAV_BAR] has the correct position at
		* Checks that the [ComponentNameMatcher.NAV_BAR] has the correct position at
		* the start and end of the transition
		*/
		@FlakyTest