Revert "Simplify the test step after changing navigation mode"

This reverts commit a630542000.

Reason for revert: Testing to see if this caused platinum flake b/293286278

Change-Id: I14fb56815b3fe914452f522e7fbd4a99ad132020
This commit is contained in:
Sam Dubey
2023-07-26 15:05:00 +00:00
committed by Android (Google) Code Review
parent a630542000
commit 234cbdd4ee
2 changed files with 10 additions and 0 deletions

View File

@@ -22,7 +22,9 @@ import android.platform.test.rule.PressHomeRule
import android.platform.test.rule.UnlockScreenRule
import android.tools.common.NavBar
import android.tools.common.Rotation
import android.tools.device.apphelpers.MessagingAppHelper
import android.tools.device.flicker.rules.ChangeDisplayOrientationRule
import android.tools.device.flicker.rules.LaunchAppRule
import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.rules.RuleChain
@@ -35,6 +37,9 @@ object Utils {
.around(
NavigationModeRule(navigationMode.value, /* changeNavigationModeAfterTest */ false)
)
.around(
LaunchAppRule(MessagingAppHelper(instrumentation), clearCacheAfterParsing = false)
)
.around(RemoveAllTasksButHomeRule())
.around(
ChangeDisplayOrientationRule(

View File

@@ -22,7 +22,9 @@ import android.platform.test.rule.PressHomeRule
import android.platform.test.rule.UnlockScreenRule
import android.tools.common.NavBar
import android.tools.common.Rotation
import android.tools.device.apphelpers.MessagingAppHelper
import android.tools.device.flicker.rules.ChangeDisplayOrientationRule
import android.tools.device.flicker.rules.LaunchAppRule
import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.rules.RuleChain
@@ -35,6 +37,9 @@ object Utils {
.around(
NavigationModeRule(navigationMode.value, /* changeNavigationModeAfterTest */ false)
)
.around(
LaunchAppRule(MessagingAppHelper(instrumentation), clearCacheAfterParsing = false)
)
.around(RemoveAllTasksButHomeRule())
.around(
ChangeDisplayOrientationRule(