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

Commit 0c491eb4 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Format code according to linter rules 

after moving classes into different packages

Bug: 307885357
Test: atest FlickerTestsAppLaunch1 FlickerTestsAppLaunch2 FlickerTestsAppClose FlickerTestsIme FlickerTestsNotification FlickerTestsRotation FlickerTestsQuickswitch FlickerServiceTests
Change-Id: I2dfc90dd4c01614065ba4a1b39696eb7431c3dd6
parent 84828f98

tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ import android.tools.device.flicker.legacy.FlickerBuilder 
import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.activityembedding.ActivityEmbeddingTestBase

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

import androidx.test.filters.RequiresDevice

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/pip/SecondaryActivityEnterPipTest.kt

+5 −12
Original line number Diff line number Diff line
@@ -36,9 +36,8 @@ import org.junit.runners.Parameterized 
/**

 * Test launching a secondary Activity into Picture-In-Picture mode.

 *

 * Setup: Start from a split A|B.

 * Transition: B enters PIP, observe the window first goes fullscreen then shrink to the bottom

 * right corner on screen.

 * Setup: Start from a split A|B. Transition: B enters PIP, observe the window first goes fullscreen

 * then shrink to the bottom right corner on screen.

 *

 * To run this test: `atest FlickerTestsOther:SecondaryActivityEnterPipTest`

 */
@@ -64,16 +63,10 @@ class SecondaryActivityEnterPipTest(flicker: LegacyFlickerTest) : 
        }

    }



    /**

     * We expect the background layer to be visible during this transition.

     */

    @Presubmit

    @Test

    override fun backgroundLayerNeverVisible(): Unit {}

    /** We expect the background layer to be visible during this transition. */

    @Presubmit @Test override fun backgroundLayerNeverVisible() {}



    /**

     * Main and secondary activity start from a split each taking half of the screen.

     */

    /** Main and secondary activity start from a split each taking half of the screen. */

    @Presubmit

    @Test

    fun layersStartFromEqualSplit() {

tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/rotation/RotateSplitNoChangeTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.tools.device.flicker.legacy.FlickerBuilder 
import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.activityembedding.ActivityEmbeddingTestBase

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

import org.junit.FixMethodOrder

import org.junit.Test

tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/splitscreen/EnterSystemSplitTest.kt

+64 −54
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import android.tools.device.flicker.legacy.FlickerBuilder 
import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import android.tools.device.traces.parsers.toFlickerComponent

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

import com.android.server.wm.flicker.activityembedding.ActivityEmbeddingTestBase

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

import com.android.server.wm.flicker.testapp.ActivityOptions

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

import com.android.wm.shell.flicker.utils.SplitScreenUtils
@@ -39,11 +39,11 @@ import org.junit.runner.RunWith 
import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



/***

/**

 * Test entering System SplitScreen with Activity Embedding Split and another app.

 *

 * Setup: Launch A|B in split and secondaryApp, return to home.

 * Transitions: Let AE Split A|B enter splitscreen with secondaryApp. Resulting in A|B|secondaryApp.

 * Setup: Launch A|B in split and secondaryApp, return to home. Transitions: Let AE Split A|B enter

 * splitscreen with secondaryApp. Resulting in A|B|secondaryApp.

 *

 * To run this test: `atest FlickerTestsOther:EnterSystemSplitTest`

 */
@@ -51,8 +51,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class EnterSystemSplitTest(flicker: LegacyFlickerTest) :

        ActivityEmbeddingTestBase(flicker) {

class EnterSystemSplitTest(flicker: LegacyFlickerTest) : ActivityEmbeddingTestBase(flicker) {



    private val secondaryApp = SplitScreenUtils.getPrimary(instrumentation)

    override val transition: FlickerBuilder.() -> Unit = {
@@ -67,12 +66,17 @@ class EnterSystemSplitTest(flicker: LegacyFlickerTest) : 
                .withHomeActivityVisible()

                .waitForAndVerify()

            startDisplayBounds =

                    wmHelper.currentState.layerState.physicalDisplayBounds

                        ?: error("Display not found")

                wmHelper.currentState.layerState.physicalDisplayBounds ?: error("Display not found")

        }

        transitions {

            SplitScreenUtils.enterSplit(wmHelper, tapl, device, testApp, secondaryApp,

                flicker.scenario.startRotation)

            SplitScreenUtils.enterSplit(

                wmHelper,

                tapl,

                device,

                testApp,

                secondaryApp,

                flicker.scenario.startRotation

            )

            SplitScreenUtils.waitForSplitComplete(wmHelper, testApp, secondaryApp)

        }

    }
@@ -85,7 +89,10 @@ class EnterSystemSplitTest(flicker: LegacyFlickerTest) : 
    @Test

    fun activityEmbeddingSplitLayerBecomesVisible() {

        flicker.splitAppLayerBoundsIsVisibleAtEnd(

                testApp, landscapePosLeft = tapl.isTablet, portraitPosTop = false)

            testApp,

            landscapePosLeft = tapl.isTablet,

            portraitPosTop = false

        )

    }



    @Presubmit
@@ -96,7 +103,10 @@ class EnterSystemSplitTest(flicker: LegacyFlickerTest) : 
    @Test

    fun secondaryLayerBecomesVisible() {

        flicker.splitAppLayerBoundsIsVisibleAtEnd(

                secondaryApp, landscapePosLeft = !tapl.isTablet, portraitPosTop = true)

            secondaryApp,

            landscapePosLeft = !tapl.isTablet,

            portraitPosTop = true

        )

    }



    @Presubmit
@@ -105,8 +115,8 @@ class EnterSystemSplitTest(flicker: LegacyFlickerTest) : 


    /**

     * After the transition there should be both ActivityEmbedding activities,

     * SplitScreenPrimaryActivity and the system split divider on screen.

     * Verify the layers are in expected sizes.

     * SplitScreenPrimaryActivity and the system split divider on screen. Verify the layers are in

     * expected sizes.

     */

    @Presubmit

    @Test
@@ -117,8 +127,7 @@ class EnterSystemSplitTest(flicker: LegacyFlickerTest) : 
            val rightAELayerRegion =

                visibleRegion(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT)

            val secondaryAppLayerRegion =

                    visibleRegion(

                            ActivityOptions.SplitScreen.Primary.COMPONENT.toFlickerComponent())

                visibleRegion(ActivityOptions.SplitScreen.Primary.COMPONENT.toFlickerComponent())

            val systemDivider = visibleRegion(SPLIT_SCREEN_DIVIDER_COMPONENT)

            leftAELayerRegion

                .plus(rightAELayerRegion.region)
@@ -133,19 +142,19 @@ class EnterSystemSplitTest(flicker: LegacyFlickerTest) : 
                .isEqual(secondaryAppLayerRegion.region.height)

            // TODO(b/292283182): Remove this special case handling.

            check { "ActivityEmbeddingSplitWidth" }

                    .that(Math.abs(

                            leftAELayerRegion.region.width - rightAELayerRegion.region.width))

                .that(Math.abs(leftAELayerRegion.region.width - rightAELayerRegion.region.width))

                .isLower(2)

            check { "SystemSplitWidth" }

                    .that(Math.abs(secondaryAppLayerRegion.region.width -

                            2 * rightAELayerRegion.region.width))

                .that(

                    Math.abs(

                        secondaryAppLayerRegion.region.width - 2 * rightAELayerRegion.region.width

                    )

                )

                .isLower(2)

        }

    }



    /**

     * Verify the windows are in expected sizes.

     */

    /** Verify the windows are in expected sizes. */

    @Presubmit

    @Test

    fun activityEmbeddingSplitWindowsAreEven() {
@@ -156,8 +165,7 @@ class EnterSystemSplitTest(flicker: LegacyFlickerTest) : 
                visibleRegion(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT)

            // There's no window for the divider bar.

            val secondaryAppLayerRegion =

                    visibleRegion(

                            ActivityOptions.SplitScreen.Primary.COMPONENT.toFlickerComponent())

                visibleRegion(ActivityOptions.SplitScreen.Primary.COMPONENT.toFlickerComponent())

            check { "ActivityEmbeddingSplitHeight" }

                .that(leftAEWindowRegion.region.height)

                .isEqual(rightAEWindowRegion.region.height)
@@ -165,12 +173,14 @@ class EnterSystemSplitTest(flicker: LegacyFlickerTest) : 
                .that(rightAEWindowRegion.region.height)

                .isEqual(secondaryAppLayerRegion.region.height)

            check { "ActivityEmbeddingSplitWidth" }

                    .that(Math.abs(

                            leftAEWindowRegion.region.width - rightAEWindowRegion.region.width))

                .that(Math.abs(leftAEWindowRegion.region.width - rightAEWindowRegion.region.width))

                .isLower(2)

            check { "SystemSplitWidth" }

                    .that(Math.abs(secondaryAppLayerRegion.region.width -

                            2 * rightAEWindowRegion.region.width))

                .that(

                    Math.abs(

                        secondaryAppLayerRegion.region.width - 2 * rightAEWindowRegion.region.width

                    )

                )

                .isLower(2)

        }

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule 
import android.tools.device.helpers.wakeUpAndGoToHomeScreen

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.launch.R

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

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

import org.junit.FixMethodOrder