Skip to content

Commit bba96fc

Browse files
committed
Use AssertK for touch capability tests
1 parent 66b7d8d commit bba96fc

2 files changed

Lines changed: 21 additions & 19 deletions

File tree

composeunstyled-theming/src/jvmTest/kotlin/ThemeJvm.test.kt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ import androidx.compose.ui.test.assertWidthIsEqualTo
2929
import androidx.compose.ui.test.onNodeWithTag
3030
import androidx.compose.ui.test.runComposeUiTest
3131
import androidx.compose.ui.unit.dp
32+
import assertk.assertThat
33+
import assertk.assertions.isFalse
34+
import assertk.assertions.isTrue
3235
import com.composeunstyled.theme.ComponentInteractiveSize
3336
import com.composeunstyled.theme.buildTheme
3437
import com.composeunstyled.theme.currentDeviceHasTouchCapabilities
3538
import com.composeunstyled.theme.isTouchSupportEnabled
3639
import kotlin.test.Test
37-
import kotlin.test.assertFalse
38-
import kotlin.test.assertTrue
3940

4041
class ThemeJvmTest {
4142
@Test
@@ -64,19 +65,19 @@ class ThemeJvmTest {
6465

6566
@Test
6667
fun awtTouchSupportDesktopPropertyIsEnabledForBooleansAndPositiveNumbers() {
67-
assertTrue(true.isTouchSupportEnabled())
68-
assertTrue(1.isTouchSupportEnabled())
69-
assertTrue("true".isTouchSupportEnabled())
70-
assertTrue("1".isTouchSupportEnabled())
68+
assertThat(true.isTouchSupportEnabled()).isTrue()
69+
assertThat(1.isTouchSupportEnabled()).isTrue()
70+
assertThat("true".isTouchSupportEnabled()).isTrue()
71+
assertThat("1".isTouchSupportEnabled()).isTrue()
7172
}
7273

7374
@Test
7475
fun awtTouchSupportDesktopPropertyIsDisabledForMissingFalseAndZeroValues() {
75-
assertFalse(null.isTouchSupportEnabled())
76-
assertFalse(false.isTouchSupportEnabled())
77-
assertFalse(0.isTouchSupportEnabled())
78-
assertFalse("false".isTouchSupportEnabled())
79-
assertFalse("0".isTouchSupportEnabled())
76+
assertThat(null.isTouchSupportEnabled()).isFalse()
77+
assertThat(false.isTouchSupportEnabled()).isFalse()
78+
assertThat(0.isTouchSupportEnabled()).isFalse()
79+
assertThat("false".isTouchSupportEnabled()).isFalse()
80+
assertThat("0".isTouchSupportEnabled()).isFalse()
8081
}
8182

8283
private fun expectedInteractiveSize() =

composeunstyled-theming/src/webTest/kotlin/ThemeWeb.test.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,39 @@
2121
*/
2222
package com.composeunstyled.theme
2323

24+
import assertk.assertThat
25+
import assertk.assertions.isFalse
26+
import assertk.assertions.isTrue
2427
import kotlin.test.Test
25-
import kotlin.test.assertFalse
26-
import kotlin.test.assertTrue
2728

2829
class ThemeWebTest {
2930
@Test
3031
fun browserTouchCapabilitiesAreEnabledWhenNavigatorReportsTouchPoints() {
31-
assertTrue(
32+
assertThat(
3233
browserHasTouchCapabilities(
3334
maxTouchPoints = 1,
3435
anyPointerCoarse = false,
3536
),
36-
)
37+
).isTrue()
3738
}
3839

3940
@Test
4041
fun browserTouchCapabilitiesAreEnabledWhenAnyPointerIsCoarse() {
41-
assertTrue(
42+
assertThat(
4243
browserHasTouchCapabilities(
4344
maxTouchPoints = 0,
4445
anyPointerCoarse = true,
4546
),
46-
)
47+
).isTrue()
4748
}
4849

4950
@Test
5051
fun browserTouchCapabilitiesAreDisabledWithoutTouchPointsOrCoarsePointer() {
51-
assertFalse(
52+
assertThat(
5253
browserHasTouchCapabilities(
5354
maxTouchPoints = null,
5455
anyPointerCoarse = false,
5556
),
56-
)
57+
).isFalse()
5758
}
5859
}

0 commit comments

Comments
 (0)