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

Commit 6f7c8255 authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge "Remove old benchmark tests" into udc-qpr-dev am: 2ffc95a2 am: 31276431 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23829163



Change-Id: I1ee2bf1688c485fc3841d07f5a4073e6a8dc30dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8dffd57f 31276431

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

+6 −7
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ package com.android.wm.shell.flicker.appcompat 


import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDevice

import android.tools.common.flicker.assertions.FlickerTest

import android.tools.common.NavBar

import android.tools.common.Rotation

import android.tools.common.datatypes.Rect

import android.tools.common.flicker.assertions.FlickerTest

import android.tools.common.traces.component.ComponentNameMatcher

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerBuilder
@@ -45,7 +45,6 @@ import org.junit.runners.Parameterized 
 *     Swipe right from the bottom of the screen to quick switch back to the app

 * ```

 */



@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
@@ -152,9 +151,8 @@ open class QuickSwitchLauncherToLetterboxAppTest(flicker: LegacyFlickerTest) : 
    @Test

    fun appWindowBecomesAndStaysVisible() {

        flicker.assertWm {

            this.isAppWindowInvisible(letterboxApp)

                .then()

                .isAppWindowVisible(letterboxApp) }

            this.isAppWindowInvisible(letterboxApp).then().isAppWindowVisible(letterboxApp)

        }

    }



    /**
@@ -245,7 +243,8 @@ open class QuickSwitchLauncherToLetterboxAppTest(flicker: LegacyFlickerTest) : 
                .isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true)

                .then()

                .isVisible(letterboxApp)

                .isVisible(ComponentNameMatcher.LETTERBOX) }

                .isVisible(ComponentNameMatcher.LETTERBOX)

        }

    }



    /** {@inheritDoc} */

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

+6 −5
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ class AutoEnterPipFromSplitScreenOnGoToHomeTest(flicker: LegacyFlickerTest) : 
    AutoEnterPipOnGoToHomeTest(flicker) {

    private val portraitDisplayBounds = WindowUtils.getDisplayBounds(Rotation.ROTATION_0)

    /** Second app used to enter split screen mode */

    private val secondAppForSplitScreen = SimpleAppHelper(

    private val secondAppForSplitScreen =

        SimpleAppHelper(

            instrumentation,

            ActivityOptions.SplitScreen.Primary.LABEL,

            ActivityOptions.SplitScreen.Primary.COMPONENT.toFlickerComponent()

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/flicker/CopyContentInSplitGesturalNavLandscape.kt

+1 −3
Original line number Diff line number Diff line
@@ -29,9 +29,7 @@ import org.junit.runner.RunWith 


@RunWith(FlickerServiceJUnit4ClassRunner::class)

class CopyContentInSplitGesturalNavLandscape : CopyContentInSplit(Rotation.ROTATION_90) {

    @ExpectedScenarios([])

    @Test

    override fun copyContentInSplit() = super.copyContentInSplit()

    @ExpectedScenarios([]) @Test override fun copyContentInSplit() = super.copyContentInSplit()



    companion object {

        @JvmStatic

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/flicker/CopyContentInSplitGesturalNavPortrait.kt

+1 −3
Original line number Diff line number Diff line
@@ -29,9 +29,7 @@ import org.junit.runner.RunWith 


@RunWith(FlickerServiceJUnit4ClassRunner::class)

class CopyContentInSplitGesturalNavPortrait : CopyContentInSplit(Rotation.ROTATION_0) {

    @ExpectedScenarios([])

    @Test

    override fun copyContentInSplit() = super.copyContentInSplit()

    @ExpectedScenarios([]) @Test override fun copyContentInSplit() = super.copyContentInSplit()



    companion object {

        @JvmStatic

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

+0 −20
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.traces.component.ComponentNameMatcher

import android.tools.common.traces.component.EdgeExtensionComponentMatcher
@@ -28,13 +27,9 @@ import android.tools.device.flicker.legacy.LegacyFlickerTestFactory 
import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.ICommonAssertions

import com.android.wm.shell.flicker.SPLIT_SCREEN_DIVIDER_COMPONENT

import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd

import com.android.wm.shell.flicker.appWindowIsVisibleAtStart

import com.android.wm.shell.flicker.appWindowKeepVisible

import com.android.wm.shell.flicker.layerKeepVisible

import com.android.wm.shell.flicker.splitAppLayerBoundsKeepVisible

import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtEnd

import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtStart

import com.android.wm.shell.flicker.splitscreen.benchmark.CopyContentInSplitBenchmark

import org.junit.FixMethodOrder

import org.junit.Test
@@ -60,21 +55,6 @@ class CopyContentInSplit(override val flicker: LegacyFlickerTest) : 
            thisTransition(this)

        }



    @PlatinumTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun cujCompleted() {

        flicker.appWindowIsVisibleAtStart(primaryApp)

        flicker.appWindowIsVisibleAtStart(textEditApp)

        flicker.splitScreenDividerIsVisibleAtStart()



        flicker.appWindowIsVisibleAtEnd(primaryApp)

        flicker.appWindowIsVisibleAtEnd(textEditApp)

        flicker.splitScreenDividerIsVisibleAtEnd()



        // The validation of copied text is already done in SplitScreenUtils.copyContentInSplit()

    }



    @Presubmit

    @Test

    fun splitScreenDividerKeepVisible() = flicker.layerKeepVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)