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

Commit 769b84f8 authored by Antonella Dellanzo's avatar Antonella Dellanzo
Browse files

Removing duplicated code 

There's duplicated code in CommonAssertions of WMShell project and FlickerTests. We are keeping the one from FlickerTests and removing the one from WMShell to avoid problems of changing it in one place and forgetiing about the other project.

Test: atest WMShellFlickerTests
Change-Id: Ie87df793933d9cbe0ccd947514027650811a1819
parent 215bcb7e

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

+0 −114
Original line number Diff line number Diff line
@@ -18,78 +18,6 @@ package com.android.wm.shell.flicker 


import com.android.server.wm.flicker.dsl.EventLogAssertion

import com.android.server.wm.flicker.dsl.LayersAssertion

import com.android.server.wm.flicker.dsl.WmAssertion

import com.android.server.wm.flicker.helpers.WindowUtils



@JvmOverloads

fun WmAssertion.statusBarWindowIsAlwaysVisible(

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    all("statusBarWindowIsAlwaysVisible", bugId, enabled) {

        this.showsAboveAppWindow(FlickerTestBase.STATUS_BAR_WINDOW_TITLE)

    }

}



@JvmOverloads

fun WmAssertion.navBarWindowIsAlwaysVisible(

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    all("navBarWindowIsAlwaysVisible", bugId, enabled) {

        this.showsAboveAppWindow(FlickerTestBase.NAVIGATION_BAR_WINDOW_TITLE)

    }

}



@JvmOverloads

fun LayersAssertion.noUncoveredRegions(

    beginRotation: Int,

    endRotation: Int = beginRotation,

    allStates: Boolean = true,

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    val startingBounds = WindowUtils.getDisplayBounds(beginRotation)

    val endingBounds = WindowUtils.getDisplayBounds(endRotation)

    if (allStates) {

        all("noUncoveredRegions", bugId, enabled) {

            if (startingBounds == endingBounds) {

                this.coversAtLeastRegion(startingBounds)

            } else {

                this.coversAtLeastRegion(startingBounds)

                        .then()

                        .coversAtLeastRegion(endingBounds)

            }

        }

    } else {

        start("noUncoveredRegions_StartingPos") {

            this.coversAtLeastRegion(startingBounds)

        }

        end("noUncoveredRegions_EndingPos") {

            this.coversAtLeastRegion(endingBounds)

        }

    }

}



@JvmOverloads

fun LayersAssertion.statusBarLayerIsAlwaysVisible(

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    all("statusBarLayerIsAlwaysVisible", bugId, enabled) {

        this.showsLayer(FlickerTestBase.STATUS_BAR_WINDOW_TITLE)

    }

}



@JvmOverloads

fun LayersAssertion.navBarLayerIsAlwaysVisible(

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    all("navBarLayerIsAlwaysVisible", bugId, enabled) {

        this.showsLayer(FlickerTestBase.NAVIGATION_BAR_WINDOW_TITLE)

    }

}



@JvmOverloads

fun LayersAssertion.appPairsDividerIsVisible(
@@ -131,48 +59,6 @@ fun LayersAssertion.dockedStackDividerIsInvisible( 
    }

}



@JvmOverloads

fun LayersAssertion.navBarLayerRotatesAndScales(

    beginRotation: Int,

    endRotation: Int = beginRotation,

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    val startingPos = WindowUtils.getNavigationBarPosition(beginRotation)

    val endingPos = WindowUtils.getNavigationBarPosition(endRotation)



    start("navBarLayerRotatesAndScales_StartingPos", bugId, enabled) {

        this.hasVisibleRegion(FlickerTestBase.NAVIGATION_BAR_WINDOW_TITLE, startingPos)

    }

    end("navBarLayerRotatesAndScales_EndingPost", bugId, enabled) {

        this.hasVisibleRegion(FlickerTestBase.NAVIGATION_BAR_WINDOW_TITLE, endingPos)

    }



    if (startingPos == endingPos) {

        all("navBarLayerRotatesAndScales", bugId, enabled) {

            this.hasVisibleRegion(FlickerTestBase.NAVIGATION_BAR_WINDOW_TITLE, startingPos)

        }

    }

}



@JvmOverloads

fun LayersAssertion.statusBarLayerRotatesScales(

    beginRotation: Int,

    endRotation: Int = beginRotation,

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    val startingPos = WindowUtils.getStatusBarPosition(beginRotation)

    val endingPos = WindowUtils.getStatusBarPosition(endRotation)



    start("statusBarLayerRotatesScales_StartingPos", bugId, enabled) {

        this.hasVisibleRegion(FlickerTestBase.STATUS_BAR_WINDOW_TITLE, startingPos)

    }

    end("statusBarLayerRotatesScales_EndingPos", bugId, enabled) {

        this.hasVisibleRegion(FlickerTestBase.STATUS_BAR_WINDOW_TITLE, endingPos)

    }

}



fun EventLogAssertion.focusChanges(

    vararg windows: String,

    bugId: Int = 0,

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ import com.android.wm.shell.flicker.helpers.AppPairsHelper 
import com.android.wm.shell.flicker.helpers.AppPairsHelper.Companion.TEST_REPETITIONS

import com.android.wm.shell.flicker.appPairsDividerIsInvisible

import com.android.wm.shell.flicker.appPairsDividerIsVisible

import com.android.wm.shell.flicker.navBarLayerIsAlwaysVisible

import com.android.wm.shell.flicker.navBarWindowIsAlwaysVisible

import com.android.wm.shell.flicker.statusBarLayerIsAlwaysVisible

import com.android.wm.shell.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

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

+4 −4
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ import com.android.server.wm.flicker.helpers.WindowUtils 
import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen

import com.android.wm.shell.flicker.helpers.FixedAppHelper

import com.android.wm.shell.flicker.helpers.PipAppHelper

import com.android.wm.shell.flicker.navBarLayerIsAlwaysVisible

import com.android.wm.shell.flicker.navBarWindowIsAlwaysVisible

import com.android.wm.shell.flicker.statusBarLayerIsAlwaysVisible

import com.android.wm.shell.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.wm.shell.flicker.testapp.Components.PipActivity.EXTRA_ENTER_PIP

import org.junit.FixMethodOrder

import org.junit.Test

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

+4 −4
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ import com.android.server.wm.flicker.helpers.WindowUtils 
import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen

import com.android.wm.shell.flicker.helpers.FixedAppHelper

import com.android.wm.shell.flicker.helpers.PipAppHelper

import com.android.wm.shell.flicker.navBarLayerIsAlwaysVisible

import com.android.wm.shell.flicker.navBarWindowIsAlwaysVisible

import com.android.wm.shell.flicker.statusBarLayerIsAlwaysVisible

import com.android.wm.shell.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.wm.shell.flicker.testapp.Components.PipActivity.ACTION_ENTER_PIP

import com.android.wm.shell.flicker.testapp.Components.PipActivity.ACTION_SET_REQUESTED_ORIENTATION

import com.android.wm.shell.flicker.testapp.Components.PipActivity.EXTRA_ENTER_PIP

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

+7 −7
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ import com.android.server.wm.flicker.repetitions 
import com.android.server.wm.flicker.startRotation

import com.android.wm.shell.flicker.helpers.FixedAppHelper

import com.android.wm.shell.flicker.helpers.PipAppHelper

import com.android.wm.shell.flicker.navBarLayerIsAlwaysVisible

import com.android.wm.shell.flicker.navBarLayerRotatesAndScales

import com.android.wm.shell.flicker.navBarWindowIsAlwaysVisible

import com.android.wm.shell.flicker.noUncoveredRegions

import com.android.wm.shell.flicker.statusBarLayerIsAlwaysVisible

import com.android.wm.shell.flicker.statusBarLayerRotatesScales

import com.android.wm.shell.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.wm.shell.flicker.testapp.Components.PipActivity.EXTRA_ENTER_PIP

import org.junit.FixMethodOrder

import org.junit.runner.RunWith