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

Commit be919254 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Create app close tests for CF ARM configuration"

parents 404b7181 d6e190f6

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class CloseAppBackButtonTest(flicker: FlickerTest) : CloseAppTransition(flicker) {

open class CloseAppBackButtonTest(flicker: FlickerTest) : CloseAppTransition(flicker) {

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit

        get() = {

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTestCfArm.kt

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm.flicker.close



import com.android.server.wm.flicker.FlickerTest

import com.android.server.wm.flicker.FlickerTestFactory

import com.android.server.wm.flicker.annotation.FlickerServiceCompatible

import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory

import org.junit.FixMethodOrder

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class CloseAppBackButtonTestCfArm(flicker: FlickerTest) : CloseAppBackButtonTest(flicker) {

    companion object {

        /**

         * Creates the test configurations.

         *

         * See [FlickerTestFactory.nonRotationTests] for configuring screen orientation and

         * navigation modes.

         */

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): List<FlickerTest> {

            return FlickerTestFactory.nonRotationTests()

        }

    }

}

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class CloseAppHomeButtonTest(flicker: FlickerTest) : CloseAppTransition(flicker) {

open class CloseAppHomeButtonTest(flicker: FlickerTest) : CloseAppTransition(flicker) {

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit

        get() = {

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTestCfArm.kt

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm.flicker.close



import com.android.server.wm.flicker.FlickerTest

import com.android.server.wm.flicker.FlickerTestFactory

import com.android.server.wm.flicker.annotation.FlickerServiceCompatible

import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory

import org.junit.FixMethodOrder

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class CloseAppHomeButtonTestCfArm(flicker: FlickerTest) : CloseAppHomeButtonTest(flicker) {

    companion object {

        /** Creates the test configurations. */

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): Collection<FlickerTest> {

            return FlickerTestFactory.nonRotationTests()

        }

    }

}