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

Commit a8bab531 authored by Robin Lee's avatar Robin Lee
Browse files

Revert "Ignore `Background for SurfaceView Camera` surface on test" 

Sounds Good, Doesn't Work (because the layer name has IDs in the middle
and can't just match as a literal).

The change in the same topic fixes the generic matcher that ignores
SurfaceView backgrounds for all flicker tests,  no matter whether
they're explicitly accounted for in the test or not.

Flag: EXEMPT test change that has no effect
Bug: 379344463
This reverts commit 1a45a88f.

Change-Id: Ibdf5ce5940a6fddc2285ed3b9c789f58192455f8
parent 6d657891

tests/FlickerTests/AppLaunch/src/com/android/server/wm/flicker/launch/OpenCameraFromHomeOnDoubleClickPowerButtonTest.kt

+2 −15
Original line number Diff line number Diff line
@@ -140,14 +140,8 @@ class OpenCameraFromHomeOnDoubleClickPowerButtonTest(flicker: LegacyFlickerTest) 


    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        flicker.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry(

                LayersTraceSubject.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS +

                    listOf(CAMERA_BACKGROUND)

            )

        }

    }

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @Postsubmit

    @Test
@@ -170,12 +164,5 @@ class OpenCameraFromHomeOnDoubleClickPowerButtonTest(flicker: LegacyFlickerTest) 
        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams() = LegacyFlickerTestFactory.nonRotationTests()



        private val CAMERA_BACKGROUND =

            ComponentNameMatcher(

                "Background for SurfaceView" +

                    "[com.google.android.GoogleCamera/" +

                    "com.google.android.apps.camera.legacy.app.activity.main.CameraActivity]"

            )

    }

}