mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-20 05:16:01 +00:00
Merge latest upstream main before Controller UI integration
# Conflicts: # app/src/main/java/com/droiddeck/launcher/SessionActivity.kt # app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt # app/src/main/java/com/droiddeck/launcher/input/PadBridge.java # app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt # app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt
This commit is contained in:
commit
ba5876bf6d
360 files changed
+34610
-1088
No files matched your search
@@ -1,10 +1,24 @@
|
||||
package com.droiddeck.launcher.ui
|
||||
|
||||
import android.app.Application
|
||||
import androidx.compose.ui.semantics.Role
|
||||
import androidx.compose.ui.semantics.SemanticsProperties
|
||||
import androidx.compose.ui.test.SemanticsMatcher
|
||||
import androidx.compose.ui.test.assertCountEquals
|
||||
import androidx.compose.ui.test.assertIsEnabled
|
||||
import androidx.compose.ui.test.assertIsNotEnabled
|
||||
import androidx.compose.ui.test.hasText
|
||||
import androidx.compose.ui.test.onAllNodesWithText
|
||||
import androidx.compose.ui.test.onLast
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.ui.test.onNodeWithText
|
||||
import androidx.compose.ui.test.performClick
|
||||
import androidx.compose.ui.test.performScrollTo
|
||||
import com.droiddeck.launcher.R
|
||||
import com.droiddeck.launcher.frontend.Library
|
||||
import com.droiddeck.launcher.session.ComponentsManager
|
||||
import java.io.File
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
@@ -12,8 +26,9 @@ import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.RuntimeEnvironment
|
||||
import org.robolectric.annotation.Config
|
||||
|
||||
// Exercise the component UI without starting App's process-wide servers or crash handler.
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [28])
|
||||
@Config(sdk = [28], application = Application::class)
|
||||
class ComponentsPageProfileTest {
|
||||
@get:Rule val compose = createRobolectricComposeRule()
|
||||
private val gameA = Library.SteamGame(42, "Game A", null, "internal")
|
||||
@@ -98,4 +113,143 @@ class ComponentsPageProfileTest {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test @Config(qualifiers = "w1280dp-h1000dp")
|
||||
fun systemPowerVrKeepsStoredDxvkDisabledAndQueuedDxvkCancellable() {
|
||||
val context = RuntimeEnvironment.getApplication()
|
||||
var cancelled = 0
|
||||
var imported = 0
|
||||
var swapped = 0
|
||||
var restored = 0
|
||||
showDxvk(
|
||||
systemPowerVr = true,
|
||||
onCancel = { cancelled++ },
|
||||
onImport = { imported++ },
|
||||
onSwap = { swapped++ },
|
||||
onRestore = { restored++ },
|
||||
)
|
||||
|
||||
compose.onNodeWithText(context.getString(R.string.cmgr_powervr_dxvk_managed)).assertExists()
|
||||
compose.onNodeWithText(context.getString(R.string.cmgr_powervr_dxvk_queued, "Next DXVK"), substring = true).assertExists()
|
||||
compose.onNodeWithText("Stored DXVK").assertIsNotEnabled()
|
||||
compose.onNodeWithText(context.getString(R.string.comp_original, "1.0")).assertIsNotEnabled()
|
||||
compose.onNodeWithText(context.getString(R.string.comp_restore_original)).assertIsNotEnabled()
|
||||
compose.onNodeWithText(context.getString(R.string.common_cancel)).performClick()
|
||||
compose.onNodeWithText(context.getString(R.string.comp_import_wcp)).performScrollTo().assertIsEnabled().performClick()
|
||||
compose.runOnIdle {
|
||||
assertEquals(1, cancelled)
|
||||
assertEquals(1, imported)
|
||||
assertEquals(0, swapped)
|
||||
assertEquals(0, restored)
|
||||
}
|
||||
}
|
||||
|
||||
@Test @Config(qualifiers = "w1280dp-h1000dp")
|
||||
fun manualRuntimeKeepsDxvkSelectionAvailable() {
|
||||
val context = RuntimeEnvironment.getApplication()
|
||||
showDxvk(systemPowerVr = false)
|
||||
|
||||
compose.onNode(hasText("Stored DXVK") and SemanticsMatcher.expectValue(SemanticsProperties.Role, Role.RadioButton)).assertIsEnabled()
|
||||
compose.onNodeWithText(context.getString(R.string.comp_original, "1.0")).assertIsEnabled()
|
||||
compose.onNodeWithText(context.getString(R.string.comp_restore_original)).assertIsEnabled()
|
||||
compose.onNodeWithText(context.getString(R.string.cmgr_powervr_dxvk_managed)).assertDoesNotExist()
|
||||
}
|
||||
|
||||
@Test @Config(qualifiers = "w1280dp-h1000dp")
|
||||
fun systemPowerVrGameProfileKeepsOtherComponentChoicesAndRuntimeOptionsAvailable() {
|
||||
val context = RuntimeEnvironment.getApplication()
|
||||
showDxvk(systemPowerVr = true)
|
||||
compose.onNodeWithText(context.getString(R.string.comp_scope_general)).performClick()
|
||||
compose.onNodeWithText("Game A").performClick()
|
||||
compose.waitUntil(5_000) {
|
||||
compose.onAllNodesWithText(context.getString(R.string.comp_game_reset)).fetchSemanticsNodes().isNotEmpty()
|
||||
}
|
||||
|
||||
compose.onNodeWithText(context.getString(R.string.gpu_system_powervr)).assertIsNotEnabled()
|
||||
compose.onNodeWithText(context.getString(R.string.cmgr_powervr_dxvk_managed)).assertExists()
|
||||
val inheritedChoices = compose.onAllNodesWithText(context.getString(R.string.comp_game_use_general))
|
||||
inheritedChoices.assertCountEquals(4) // FEX preset, FEX package, Proton and VKD3D remain selectable.
|
||||
repeat(4) { inheritedChoices[it].assertIsEnabled() }
|
||||
val runtimeOptions = compose.onAllNodesWithText(context.getString(R.string.comp_game_runtime_options))
|
||||
runtimeOptions.assertCountEquals(2)
|
||||
repeat(2) { runtimeOptions[it].assertIsEnabled() }
|
||||
compose.onNodeWithText(context.getString(R.string.comp_this_proton).uppercase()).assertDoesNotExist()
|
||||
|
||||
compose.onNodeWithText("Game A").performClick()
|
||||
compose.onNodeWithText(context.getString(R.string.comp_scope_general)).performClick()
|
||||
compose.onNodeWithText(context.getString(R.string.comp_this_proton).uppercase()).assertExists()
|
||||
}
|
||||
|
||||
@Test @Config(qualifiers = "w1280dp-h1000dp")
|
||||
fun systemPowerVrGameProfileCanClearAnExistingDxvkOverrideWithoutSelectingAnother() {
|
||||
val context = RuntimeEnvironment.getApplication()
|
||||
showDxvk(systemPowerVr = true, gameDxvkOverride = true)
|
||||
compose.onNodeWithText(context.getString(R.string.comp_scope_general)).performClick()
|
||||
compose.onNodeWithText("Game A").performClick()
|
||||
compose.waitUntil(5_000) {
|
||||
compose.onAllNodesWithText(context.getString(R.string.comp_game_reset)).fetchSemanticsNodes().isNotEmpty()
|
||||
}
|
||||
|
||||
compose.onNodeWithText(context.getString(R.string.gpu_system_powervr)).performScrollTo().assertIsEnabled().performClick()
|
||||
compose.onNodeWithText("Stored DXVK").assertDoesNotExist()
|
||||
compose.onAllNodesWithText(context.getString(R.string.comp_game_use_general)).onLast().performClick()
|
||||
compose.waitUntil(5_000) { "dxvk" !in ComponentsManager.gameComponents(context, "42") }
|
||||
compose.onNodeWithText(context.getString(R.string.gpu_system_powervr)).assertIsNotEnabled()
|
||||
}
|
||||
|
||||
private fun showDxvk(
|
||||
systemPowerVr: Boolean,
|
||||
gameDxvkOverride: Boolean = false,
|
||||
onCancel: () -> Unit = {},
|
||||
onImport: () -> Unit = {},
|
||||
onSwap: (String) -> Unit = {},
|
||||
onRestore: (String) -> Unit = {},
|
||||
) {
|
||||
val context = RuntimeEnvironment.getApplication()
|
||||
File(context.filesDir, "components/state.json").apply {
|
||||
parentFile!!.mkdirs()
|
||||
writeText(if (gameDxvkOverride) """{"profiles":{"42":{"dxvk":"stored.wcp"}}}""" else "{}")
|
||||
}
|
||||
val proton = ComponentsManager.Proton(
|
||||
"test-proton", "Test Proton", File(context.filesDir, "test-proton"), "/test-proton", "1.0", false,
|
||||
)
|
||||
val snapshot = ComponentsManager.Snapshot(
|
||||
protons = listOf(ComponentsManager.ProtonView(
|
||||
proton = proton,
|
||||
components = mapOf("dxvk" to ComponentsManager.Component("1.0", "", "Stored DXVK", "", "stored.wcp", "Next DXVK")),
|
||||
originals = listOf(ComponentsManager.Original("dxvk", "1.0", "Original DXVK", 1)),
|
||||
inUseByGame = false,
|
||||
)),
|
||||
packages = listOf(ComponentsManager.Package("stored.wcp", "dxvk", "Stored DXVK", "", 1)),
|
||||
)
|
||||
compose.setContent {
|
||||
DroidDeckTheme {
|
||||
ComponentsPage(
|
||||
snapshot = snapshot,
|
||||
catalog = emptyList(),
|
||||
catalogAt = 0,
|
||||
protonId = proton.id,
|
||||
comp = "dxvk",
|
||||
checking = false,
|
||||
busy = null,
|
||||
downloads = emptyMap(),
|
||||
onProton = {},
|
||||
onComp = {},
|
||||
onSwap = onSwap,
|
||||
onRestore = onRestore,
|
||||
onCancelQueued = onCancel,
|
||||
onDeletePackage = {},
|
||||
onDeleteOriginal = {},
|
||||
onDownload = {},
|
||||
onRefresh = {},
|
||||
onImport = onImport,
|
||||
onBack = {},
|
||||
gpu = GpuDriversState(powerVr = true, systemPowerVr = systemPowerVr),
|
||||
games = listOf(Library.SteamGame(42, "Game A", null, "internal")),
|
||||
requestInitialFocus = false,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user