Skip to content

Commit 3fd9a9a

Browse files
authored
Support trackpad buttons in tests (JetBrains#2901)
Fixes https://youtrack.jetbrains.com/issue/CMP-9904/Implement-TrackpadButton-actual ## Release Notes N/A
1 parent 63c0ba9 commit 3fd9a9a

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/Trackpad.skiko.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ package androidx.compose.ui.test
1818

1919
import kotlin.jvm.JvmInline
2020

21-
// TODO: https://youtrack.jetbrains.com/issue/CMP-9904/Implement-TrackpadButton-actual
2221
@JvmInline
2322
actual value class TrackpadButton actual constructor(actual val buttonId: Int) {
2423
actual companion object {
2524
actual val Primary: TrackpadButton
26-
get() = TODO("Not yet implemented")
25+
get() = TrackpadButton(0)
2726
actual val Secondary: TrackpadButton
28-
get() = TODO("Not yet implemented")
27+
get() = TrackpadButton(1)
2928
actual val Tertiary: TrackpadButton
30-
get() = TODO("Not yet implemented")
29+
get() = TrackpadButton(2)
3130
}
3231
}

compose/ui/ui-test/src/skikoTest/kotlin/androidx/compose/ui/test/TrackpadInputTest.kt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,11 @@ import androidx.compose.ui.geometry.Offset
2828
import androidx.compose.ui.input.pointer.*
2929
import androidx.compose.ui.platform.testTag
3030
import androidx.compose.ui.unit.dp
31-
import kotlin.test.Ignore
3231
import kotlin.test.Test
3332
import kotlin.test.assertEquals
3433
import kotlin.test.assertFalse
3534
import kotlin.test.assertTrue
3635

37-
// TODO: https://youtrack.jetbrains.com/issue/CMP-9904/Implement-TrackpadButton-actual
38-
@Ignore
3936
/**
4037
* Tests the trackpad-event sending functionality of the test framework.
4138
*/
@@ -229,12 +226,12 @@ class TrackpadInputTest {
229226

230227
onNodeWithTag("tag").apply {
231228
performTrackpadInput {
232-
//scroll(Offset(0f, 50f))
229+
pan(Offset(0f, 50f))
233230
}
234231
assertEquals(Offset(0f, 50f), panDelta, "Wrong vertical scroll delta detected")
235232

236233
performTrackpadInput {
237-
//scroll(Offset(30f, 0f))
234+
pan(Offset(30f, 0f))
238235
}
239236
assertEquals(Offset(30f, 0f), panDelta, "Wrong horizontal scroll delta detected")
240237
}
@@ -262,12 +259,12 @@ class TrackpadInputTest {
262259

263260
onNodeWithTag("tag").apply {
264261
performTrackpadInput {
265-
// pinch(0.5f)
262+
scale(0.5f)
266263
}
267264
assertEquals(0.5f, scale, "Wrong vertical scroll delta detected")
268265

269266
performTrackpadInput {
270-
// pinch(2.0f)
267+
scale(2.0f)
271268
}
272269
assertEquals(2.0f, scale, "Wrong horizontal scroll delta detected")
273270
}

0 commit comments

Comments
 (0)