Update & fix tests

Author: MatkovIvan

compose/foundation/foundation/build.gradle

@@ -152,12 +152,6 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 dependsOn(jsWasmMain)
             }
 
-            commonTest {
-                dependencies {
-                    implementation(kotlin("test"))
-                }
-            }
-
             // TODO(b/214407011): These dependencies leak into instrumented tests as well. If you
             //  need to add Robolectric (which must be kept out of androidAndroidTest), use a top
             //  level dependencies block instead:

compose/foundation/foundation/src/desktopTest/kotlin/androidx/compose/foundation/text/selection/DesktopTextFieldSelectionManagerTest.kt

@@ -124,13 +124,14 @@ class DesktopTextFieldSelectionManagerTest {
 
     @Test
     fun TextFieldSelectionManager_mouseSelectionObserver_onStart() {
-        manager.mouseSelectionObserver.onStart(dragBeginPosition, SelectionAdjustment.None)
+        manager.mouseSelectionObserver.onStart(dragBeginPosition, SelectionAdjustment.None, 1)
 
         assertThat(value.selection).isEqualTo(TextRange(0, 0))
 
         manager.mouseSelectionObserver.onStart(
             dragBeginPosition + dragDistance,
-            SelectionAdjustment.None
+            SelectionAdjustment.None,
+            1
         )
         assertThat(value.selection).isEqualTo(TextRange(8, 8))
     }
@@ -148,7 +149,7 @@ class DesktopTextFieldSelectionManagerTest {
     @Test
     fun TextFieldSelectionManager_mouseSelectionObserver_onDrag() {
         val observer = manager.mouseSelectionObserver
-        observer.onStart(dragBeginPosition, SelectionAdjustment.None)
+        observer.onStart(dragBeginPosition, SelectionAdjustment.None, 1)
         observer.onDrag(dragDistance, SelectionAdjustment.None)
 
         assertThat(value.selection).isEqualTo(TextRange(0, 8))
@@ -157,7 +158,7 @@ class DesktopTextFieldSelectionManagerTest {
     @Test
     fun TextFieldSelectionManager_mouseSelectionObserver_copy() = runTest {
         val observer = manager.mouseSelectionObserver
-        observer.onStart(dragBeginPosition, SelectionAdjustment.None)
+        observer.onStart(dragBeginPosition, SelectionAdjustment.None, 1)
         observer.onDrag(dragDistance, SelectionAdjustment.None)
 
         manager.value = value

compose/foundation/foundation/src/skikoTest/kotlin/androidx/compose/foundation/Assert.kt

@@ -20,6 +20,7 @@ import kotlin.math.abs
 import kotlin.test.assertContains
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
 import kotlin.test.assertNotEquals
 import kotlin.test.assertTrue
 
@@ -36,18 +37,18 @@ internal fun <T> AssertThat<T>.isEqualTo(a: Any?) {
     assertEquals(a, t)
 }
 
-internal fun AssertThat<Float>.isEqualTo(f: Float, eps: Float = 0f) {
-    if (eps != 0f) {
-        assertTrue(message = message ?: "|$t - $f| exceeds $eps") { abs(t!! - f) <= eps }
-    } else {
-        assertEquals(f, t!!, message = message)
-    }
+internal fun AssertThat<Float>.isEqualTo(f: Float, absoluteTolerance: Float = 0.001f) {
+    assertEquals(f, t!!, absoluteTolerance, message = message)
 }
 
 internal fun <T> AssertThat<T>.isNotEqualTo(a: Any?) {
     assertNotEquals(a, t)
 }
 
+internal fun AssertThat<Float>.isNotEqualTo(f: Float, absoluteTolerance: Float = 0.001f) {
+    assertNotEquals(f, t!!, absoluteTolerance, message = message)
+}
+
 internal fun AssertThat<Int>.isEqualTo(i: Int, d: Int = 0) {
     if (d != 0) {
         assertTrue(message = message ?: "|$t - $i| exceeds $d") { abs(t!! - i) <= d }
@@ -110,6 +111,10 @@ internal fun AssertThat<Float>.isLessThan(n: Int) {
     assertTrue(t!! < n, message ?: "$t is not less than $n")
 }
 
+internal fun AssertThat<Float>.isNotNaN() {
+    assertFalse(t!!.isNaN(), message ?: "$t is NaN")
+}
+
 internal fun <T : Collection<*>> AssertThat<T>.isEmpty() {
     assertTrue(t!!.isEmpty(), message ?: "$t is not empty")
 }
@@ -126,7 +131,7 @@ internal fun <K, T : Collection<*>> AssertThat<T>.contains(vararg items: K) {
 
 internal fun AssertThat<*>.isZero() = isEqualTo(0)
 
-internal fun AssertThat<*>.isNonZero() = isNotEqualTo(0)
+internal fun AssertThat<Float>.isNonZero() = isNotEqualTo(0f, absoluteTolerance = 0.001f)
 
 internal fun AssertThat<*>.isNull() {
     assertEquals(null, t, message ?: "$t expected to be null")
@@ -144,4 +149,4 @@ internal fun assertWithMessage(message: String) = AssertMessage(message)
 
 internal fun AssertThat<Int>.isGreaterThan(other: Int, d: Int = 0) {
     assertTrue(message ?: "The was expected to be greater than $other. But value = $t") { t!! > other }
-}
+}

compose/foundation/foundation/src/skikoTest/kotlin/androidx/compose/foundation/ModifierTestUtils.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 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 androidx.compose.foundation
+
+import androidx.compose.ui.Modifier
+import kotlin.test.assertEquals
+import kotlin.test.assertNotEquals
+
+// A copy from compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ModifierTestUtils.kt
+// TODO commonize compose/test-utils properly
+
+fun Modifier.toList(): List<Modifier.Element> =
+    foldIn(mutableListOf()) { acc, e -> acc.apply { acc.add(e) } }
+
+@Suppress("ModifierFactoryReturnType") fun Modifier.first(): Modifier.Element = toList().first()
+
+/**
+ * Asserts that creating two modifier with the same inputs will resolve to true when compared. In a
+ * similar fashion, toggling the inputs will resolve to false. Ideally, all modifier elements should
+ * preserve this property so when creating a modifier, an additional test should be included to
+ * guarantee that.
+ */
+fun assertModifierIsPure(createModifier: (toggle: Boolean) -> Modifier) {
+    val first = createModifier(true)
+    val second = createModifier(false)
+    val third = createModifier(true)
+
+    assertEquals(first, third, "Modifier with same inputs should resolve true to equals call")
+    assertNotEquals(first, second, "Modifier with different inputs should resolve false to equals call")
+}