Merge "Ignore test that is triggering ANR" into main (2779a36f) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewTest.kt

+26 −22

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.graphics.Insets
		import android.graphics.Rect
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.platform.test.annotations.FlakyTest
		import android.testing.TestableLooper.RunWithLooper
		import android.view.DisplayCutout
		import android.view.DisplayShape
		@@ -49,6 +50,7 @@ import org.mockito.Mockito.spy
		import org.mockito.Mockito.times
		import org.mockito.Mockito.verify

		@FlakyTest(bugId = 406551872)
		@SmallTest
		@RunWithLooper(setAsMainLooper = true)
		class PhoneStatusBarViewTest : SysuiTestCase() {
		@@ -279,7 +281,6 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
		assertThat(view.paddingBottom).isEqualTo(0)
		}


		@Test
		fun onConfigurationChanged_updatesLeftTopRightPaddingsBasedOnInsets() {
		val insets = Insets.of(/* left= / 40, / top= / 30, / right= / 20, / bottom= */ 10)
		@@ -314,7 +315,8 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
		val newInsets = Insets.NONE

		var useNewInsets = false
		val insetsFetcher = PhoneStatusBarView.InsetsFetcher {
		val insetsFetcher =
		PhoneStatusBarView.InsetsFetcher {
		if (useNewInsets) {
		newInsets
		} else {
		@@ -342,7 +344,8 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
		val newInsets = Insets.NONE

		var useNewInsets = false
		val insetsFetcher = PhoneStatusBarView.InsetsFetcher {
		val insetsFetcher =
		PhoneStatusBarView.InsetsFetcher {
		if (useNewInsets) {
		newInsets
		} else {
		@@ -373,7 +376,8 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
		val newInsets = Insets.NONE

		var useNewInsets = false
		val insetsFetcher = PhoneStatusBarView.InsetsFetcher {
		val insetsFetcher =
		PhoneStatusBarView.InsetsFetcher {
		if (useNewInsets) {
		newInsets
		} else {
		@@ -402,7 +406,7 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
		val newHeight = 123456
		context.orCreateTestableResources.addOverride(
		R.dimen.status_bar_system_icons_height,
		newHeight
		newHeight,
		)

		view.onConfigurationChanged(Configuration())
		@@ -444,7 +448,7 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
		.inflate(
		R.layout.status_bar,
		/* root= */ FrameLayout(context),
		/* attachToRoot = */ false
		/* attachToRoot = */ false,
		) as PhoneStatusBarView

		private fun emptyWindowInsets() =
		@@ -465,6 +469,6 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
		/* typeBoundingRectsMap = */ arrayOf(),
		/* typeMaxBoundingRectsMap = */ arrayOf(),
		/* frameWidth = */ 0,
		/* frameHeight = */ 0
		/* frameHeight = */ 0,
		)
		}