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

Commit eed6623b authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Revert "Remove FlickerService tests" 

This reverts commit 26337c7c.

Reason for revert: Add back WMShellFlickerServiceTests

Change-Id: I7f1d325e0b4772db948e20e76fc0b3e4a96227e2
parent 26337c7c

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

0 → 100644
+40 −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.wm.shell.flicker.service.splitscreen.flicker



import android.tools.common.Rotation

import android.tools.common.flicker.FlickerConfig

import android.tools.common.flicker.annotation.ExpectedScenarios

import android.tools.common.flicker.annotation.FlickerConfigProvider

import android.tools.common.flicker.config.FlickerConfig

import android.tools.common.flicker.config.FlickerServiceConfig

import android.tools.device.flicker.junit.FlickerServiceJUnit4ClassRunner

import com.android.wm.shell.flicker.service.splitscreen.scenarios.CopyContentInSplit

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(FlickerServiceJUnit4ClassRunner::class)

class CopyContentInSplitGesturalNavLandscape : CopyContentInSplit(Rotation.ROTATION_90) {

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



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig().use(FlickerServiceConfig.DEFAULT)

    }

}

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

0 → 100644
+40 −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.wm.shell.flicker.service.splitscreen.flicker



import android.tools.common.Rotation

import android.tools.common.flicker.FlickerConfig

import android.tools.common.flicker.annotation.ExpectedScenarios

import android.tools.common.flicker.annotation.FlickerConfigProvider

import android.tools.common.flicker.config.FlickerConfig

import android.tools.common.flicker.config.FlickerServiceConfig

import android.tools.device.flicker.junit.FlickerServiceJUnit4ClassRunner

import com.android.wm.shell.flicker.service.splitscreen.scenarios.CopyContentInSplit

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(FlickerServiceJUnit4ClassRunner::class)

class CopyContentInSplitGesturalNavPortrait : CopyContentInSplit(Rotation.ROTATION_0) {

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



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig().use(FlickerServiceConfig.DEFAULT)

    }

}

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

0 → 100644
+44 −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.wm.shell.flicker.service.splitscreen.flicker



import android.tools.common.Rotation

import android.tools.common.flicker.FlickerConfig

import android.tools.common.flicker.annotation.ExpectedScenarios

import android.tools.common.flicker.annotation.FlickerConfigProvider

import android.tools.common.flicker.config.FlickerConfig

import android.tools.common.flicker.config.FlickerServiceConfig

import android.tools.device.flicker.junit.FlickerServiceJUnit4ClassRunner

import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByDivider

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(FlickerServiceJUnit4ClassRunner::class)

class DismissSplitScreenByDividerGesturalNavLandscape :

    DismissSplitScreenByDivider(Rotation.ROTATION_90) {



    @ExpectedScenarios(["SPLIT_SCREEN_EXIT"])

    @Test

    override fun dismissSplitScreenByDivider() = super.dismissSplitScreenByDivider()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig().use(FlickerServiceConfig.DEFAULT)

    }

}

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

0 → 100644
+44 −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.wm.shell.flicker.service.splitscreen.flicker



import android.tools.common.Rotation

import android.tools.common.flicker.FlickerConfig

import android.tools.common.flicker.annotation.ExpectedScenarios

import android.tools.common.flicker.annotation.FlickerConfigProvider

import android.tools.common.flicker.config.FlickerConfig

import android.tools.common.flicker.config.FlickerServiceConfig

import android.tools.device.flicker.junit.FlickerServiceJUnit4ClassRunner

import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByDivider

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(FlickerServiceJUnit4ClassRunner::class)

class DismissSplitScreenByDividerGesturalNavPortrait :

    DismissSplitScreenByDivider(Rotation.ROTATION_0) {



    @ExpectedScenarios(["SPLIT_SCREEN_EXIT"])

    @Test

    override fun dismissSplitScreenByDivider() = super.dismissSplitScreenByDivider()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig().use(FlickerServiceConfig.DEFAULT)

    }

}

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

0 → 100644
+44 −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.wm.shell.flicker.service.splitscreen.flicker



import android.tools.common.Rotation

import android.tools.common.flicker.FlickerConfig

import android.tools.common.flicker.annotation.ExpectedScenarios

import android.tools.common.flicker.annotation.FlickerConfigProvider

import android.tools.common.flicker.config.FlickerConfig

import android.tools.common.flicker.config.FlickerServiceConfig

import android.tools.device.flicker.junit.FlickerServiceJUnit4ClassRunner

import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByGoHome

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(FlickerServiceJUnit4ClassRunner::class)

class DismissSplitScreenByGoHomeGesturalNavLandscape :

    DismissSplitScreenByGoHome(Rotation.ROTATION_90) {



    @ExpectedScenarios(["SPLIT_SCREEN_EXIT"])

    @Test

    override fun dismissSplitScreenByGoHome() = super.dismissSplitScreenByGoHome()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig().use(FlickerServiceConfig.DEFAULT)

    }

}