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

Commit 15fe59f3 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Move (predictive) back tests into PredictiveBackHandlerTest 

This CL simply moves the tests for (predictive) back into their own
file. This is a pure clean up that shouldn't impact anything.

Bug: 350705972
Test: atest PredictiveBackHandlerTest
Flag: EXEMPT test only
Change-Id: I6020701c4f4b4c20e70a9de6a36aaa15097bd747
parent b6fa1294

packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/PredictiveBackHandlerTest.kt

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

 * Copyright (C) 2024 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.compose.animation.scene



import androidx.activity.BackEventCompat

import androidx.activity.ComponentActivity

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.ui.Modifier

import androidx.compose.ui.test.junit4.createAndroidComposeRule

import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.compose.animation.scene.TestScenes.SceneA

import com.android.compose.animation.scene.TestScenes.SceneB

import com.android.compose.animation.scene.subjects.assertThat

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(AndroidJUnit4::class)

class PredictiveBackHandlerTest {

    // We use createAndroidComposeRule() here and not createComposeRule() because we need an

    // activity for testBack().

    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()



    @Test

    fun testBack() {

        val layoutState = rule.runOnUiThread { MutableSceneTransitionLayoutState(SceneA) }

        rule.setContent {

            SceneTransitionLayout(layoutState) {

                scene(SceneA, mapOf(Back to SceneB)) { Box(Modifier.fillMaxSize()) }

                scene(SceneB) { Box(Modifier.fillMaxSize()) }

            }

        }



        assertThat(layoutState.transitionState).hasCurrentScene(SceneA)



        rule.runOnUiThread { rule.activity.onBackPressedDispatcher.onBackPressed() }

        rule.waitForIdle()

        assertThat(layoutState.transitionState).hasCurrentScene(SceneB)

    }



    @Test

    fun testPredictiveBack() {

        val layoutState = rule.runOnUiThread { MutableSceneTransitionLayoutState(SceneA) }

        rule.setContent {

            SceneTransitionLayout(layoutState) {

                scene(SceneA, mapOf(Back to SceneB)) { Box(Modifier.fillMaxSize()) }

                scene(SceneB) { Box(Modifier.fillMaxSize()) }

            }

        }



        assertThat(layoutState.transitionState).hasCurrentScene(SceneA)



        // Start back.

        val dispatcher = rule.activity.onBackPressedDispatcher

        rule.runOnUiThread {

            dispatcher.dispatchOnBackStarted(backEvent())

            dispatcher.dispatchOnBackProgressed(backEvent(progress = 0.4f))

        }



        val transition = assertThat(layoutState.transitionState).isTransition()

        assertThat(transition).hasFromScene(SceneA)

        assertThat(transition).hasToScene(SceneB)

        assertThat(transition).hasProgress(0.4f)



        // Cancel it.

        rule.runOnUiThread { dispatcher.dispatchOnBackCancelled() }

        rule.waitForIdle()

        assertThat(layoutState.transitionState).hasCurrentScene(SceneA)

        assertThat(layoutState.transitionState).isIdle()



        // Start again and commit it.

        rule.runOnUiThread {

            dispatcher.dispatchOnBackStarted(backEvent())

            dispatcher.dispatchOnBackProgressed(backEvent(progress = 0.4f))

            dispatcher.onBackPressed()

        }

        rule.waitForIdle()

        assertThat(layoutState.transitionState).hasCurrentScene(SceneB)

        assertThat(layoutState.transitionState).isIdle()

    }



    private fun backEvent(progress: Float = 0f): BackEventCompat {

        return BackEventCompat(

            touchX = 0f,

            touchY = 0f,

            progress = progress,

            swipeEdge = BackEventCompat.EDGE_LEFT,

        )

    }

}

packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutTest.kt

+2 −61
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.compose.animation.scene



import androidx.activity.BackEventCompat

import androidx.activity.ComponentActivity

import androidx.compose.animation.core.FastOutSlowInEasing

import androidx.compose.animation.core.LinearEasing

import androidx.compose.animation.core.tween
@@ -43,7 +41,7 @@ import androidx.compose.ui.test.assertHeightIsEqualTo 
import androidx.compose.ui.test.assertIsDisplayed

import androidx.compose.ui.test.assertPositionInRootIsEqualTo

import androidx.compose.ui.test.assertWidthIsEqualTo

import androidx.compose.ui.test.junit4.createAndroidComposeRule

import androidx.compose.ui.test.junit4.createComposeRule

import androidx.compose.ui.test.onChild

import androidx.compose.ui.test.onNodeWithTag

import androidx.compose.ui.test.onNodeWithText
@@ -80,9 +78,7 @@ class SceneTransitionLayoutTest { 
            rule.runOnUiThread { layoutState.setTargetScene(value, coroutineScope) }

        }



    // We use createAndroidComposeRule() here and not createComposeRule() because we need an

    // activity for testBack().

    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()

    @get:Rule val rule = createComposeRule()



    /** The content under test. */

    @Composable
@@ -172,52 +168,6 @@ class SceneTransitionLayoutTest { 
        assertThat(layoutState.transitionState).hasCurrentScene(SceneB)

    }



    @Test

    fun testBack() {

        rule.setContent { TestContent() }



        assertThat(layoutState.transitionState).hasCurrentScene(SceneA)



        rule.runOnUiThread { rule.activity.onBackPressedDispatcher.onBackPressed() }

        rule.waitForIdle()

        assertThat(layoutState.transitionState).hasCurrentScene(SceneB)

    }



    @Test

    fun testPredictiveBack() {

        rule.setContent { TestContent() }



        assertThat(layoutState.transitionState).hasCurrentScene(SceneA)



        // Start back.

        val dispatcher = rule.activity.onBackPressedDispatcher

        rule.runOnUiThread {

            dispatcher.dispatchOnBackStarted(backEvent())

            dispatcher.dispatchOnBackProgressed(backEvent(progress = 0.4f))

        }



        val transition = assertThat(layoutState.transitionState).isTransition()

        assertThat(transition).hasFromScene(SceneA)

        assertThat(transition).hasToScene(SceneB)

        assertThat(transition).hasProgress(0.4f)



        // Cancel it.

        rule.runOnUiThread { dispatcher.dispatchOnBackCancelled() }

        rule.waitForIdle()

        assertThat(layoutState.transitionState).hasCurrentScene(SceneA)

        assertThat(layoutState.transitionState).isIdle()



        // Start again and commit it.

        rule.runOnUiThread {

            dispatcher.dispatchOnBackStarted(backEvent())

            dispatcher.dispatchOnBackProgressed(backEvent(progress = 0.4f))

            dispatcher.onBackPressed()

        }

        rule.waitForIdle()

        assertThat(layoutState.transitionState).hasCurrentScene(SceneB)

        assertThat(layoutState.transitionState).isIdle()

    }



    @Test

    fun testTransitionState() {

        rule.setContent { TestContent() }
@@ -550,13 +500,4 @@ class SceneTransitionLayoutTest { 
        assertThat(keyInB).isEqualTo(SceneB)

        assertThat(keyInC).isEqualTo(SceneC)

    }



    private fun backEvent(progress: Float = 0f): BackEventCompat {

        return BackEventCompat(

            touchX = 0f,

            touchY = 0f,

            progress = progress,

            swipeEdge = BackEventCompat.EDGE_LEFT,

        )

    }

}