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

Commit 4320698b authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Replace coversRegion for coversAtLeastRegion 

The flickerlib now supports coversAtLeastRegion and coversAtMostRegion to determine the minimum/maximum area covered by a set of layers.

Update tests to invoke the new method

Test: atest FlickerTests
Change-Id: I3bc8f10745beb4776fc03a70adf866fdcea8d8af
parent 4a21b8ec

tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt

+5 −5
Original line number Diff line number Diff line
@@ -53,19 +53,19 @@ fun LayersAssertion.noUncoveredRegions( 
    if (allStates) {

        all("noUncoveredRegions", enabled, bugId) {

            if (startingBounds == endingBounds) {

                this.coversRegion(startingBounds)

                this.coversAtLeastRegion(startingBounds)

            } else {

                this.coversRegion(startingBounds)

                this.coversAtLeastRegion(startingBounds)

                        .then()

                        .coversRegion(endingBounds)

                        .coversAtLeastRegion(endingBounds)

            }

        }

    } else {

        start("noUncoveredRegions_StartingPos") {

            this.coversRegion(startingBounds)

            this.coversAtLeastRegion(startingBounds)

        }

        end("noUncoveredRegions_EndingPos") {

            this.coversRegion(endingBounds)

            this.coversAtLeastRegion(endingBounds)

        }

    }

}

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -128,11 +128,11 @@ class SeamlessAppRotationTest( 
                        val startingBounds = WindowUtils.getDisplayBounds(beginRotation)

                        val endingBounds = WindowUtils.getDisplayBounds(endRotation)

                        if (startingBounds == endingBounds) {

                            this.coversRegion(startingBounds)

                            this.coversAtLeastRegion(startingBounds)

                        } else {

                            this.coversRegion(startingBounds)

                            this.coversAtLeastRegion(startingBounds)

                                    .then()

                                    .coversRegion(endingBounds)

                                    .coversAtLeastRegion(endingBounds)

                        }

                    }

                }