summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Priyanka Advani (xWF) <padvani@google.com> 2024-11-15 00:17:39 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-11-15 00:17:39 +0000
commitaaa17a0071ba3e61c2f8283a8d68941684f1045a (patch)
treeb21bbac8f52898ce118a936c2ae888fb1c4ab812
parentc039ec197aec82cd1b69b13510ed456b947c0ae9 (diff)
Revert "Add a functional test for no-desktop-task-limit"
This reverts commit c039ec197aec82cd1b69b13510ed456b947c0ae9. Reason for revert: Droidmonitor created revert due to b/379185473. Will be verifying through ABTD before submission. Change-Id: Id6212ad999f42e6f84394f76d33a186899653de2
-rw-r--r--libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/OpenUnlimitedAppsTest.kt27
-rw-r--r--libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/OpenUnlimitedApps.kt73
2 files changed, 0 insertions, 100 deletions
diff --git a/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/OpenUnlimitedAppsTest.kt b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/OpenUnlimitedAppsTest.kt
deleted file mode 100644
index 9462f15335de..000000000000
--- a/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/OpenUnlimitedAppsTest.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.wm.shell.functional
-
-import android.platform.test.annotations.Postsubmit
-import com.android.wm.shell.scenarios.OpenUnlimitedApps
-import org.junit.runner.RunWith
-import org.junit.runners.BlockJUnit4ClassRunner
-
-/* Functional test for [OpenUnlimitedApps]. */
-@RunWith(BlockJUnit4ClassRunner::class)
-@Postsubmit
-class OpenUnlimitedAppsTest : OpenUnlimitedApps()
diff --git a/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/OpenUnlimitedApps.kt b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/OpenUnlimitedApps.kt
deleted file mode 100644
index 3d716953d283..000000000000
--- a/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/OpenUnlimitedApps.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.wm.shell.scenarios
-
-import android.app.Instrumentation
-import android.tools.traces.parsers.WindowManagerStateHelper
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.uiautomator.UiDevice
-import com.android.launcher3.tapl.LauncherInstrumentation
-import com.android.server.wm.flicker.helpers.DesktopModeAppHelper
-import com.android.server.wm.flicker.helpers.MailAppHelper
-import com.android.server.wm.flicker.helpers.SimpleAppHelper
-import com.android.window.flags.Flags
-import com.android.wm.shell.shared.desktopmode.DesktopModeStatus
-import org.junit.After
-import org.junit.Assume
-import org.junit.Before
-import org.junit.Ignore
-import org.junit.Test
-/**
- * Base scenario test for opening many apps on the device without the window limit.
- */
-@Ignore("Test Base Class")
-abstract class OpenUnlimitedApps()
-{
- private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
- private val tapl = LauncherInstrumentation()
- private val wmHelper = WindowManagerStateHelper(instrumentation)
- private val device = UiDevice.getInstance(instrumentation)
-
- private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))
- private val mailApp = DesktopModeAppHelper(MailAppHelper(instrumentation))
-
- private val maxNum = DesktopModeStatus.getMaxTaskLimit(instrumentation.context)
-
- @Before
- fun setup() {
- Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)
- Assume.assumeTrue(maxNum == 0)
- testApp.enterDesktopWithDrag(wmHelper, device)
- }
-
- @Test
- open fun openUnlimitedApps() {
- // The maximum number of active tasks is infinite. We here use 12 as a large enough number.
- val openTaskNum = 12
-
- // Launch new [openTaskNum] tasks.
- for (i in 1..openTaskNum) {
- mailApp.launchViaIntent(wmHelper)
- }
- }
-
- @After
- fun teardown() {
- testApp.exit(wmHelper)
- mailApp.exit(wmHelper)
- }
-}