Skip to content

Commit e9f6480

Browse files
committed
Migrated test cases in the :compose:runtime module.
Added StandardTestDispatcher() to all the compose tests present in the runtime module. Also, removed the module from the ignore list of the ComposeTestRuleDispatcherDetector. Bug: 254115946 Test: Not Applicable Change-Id: Iba6274e5e8bc1d648aa53045bd0be04d15c1547f
1 parent 3dc154f commit e9f6480

20 files changed

Lines changed: 98 additions & 43 deletions

File tree

‎compose/runtime/runtime-livedata/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,4 @@ androidx {
5858
android {
5959
compileSdk = 35
6060
namespace = "androidx.compose.runtime.livedata"
61-
lint.disable += "ComposeTestRuleDispatcher"
6261
}

‎compose/runtime/runtime-livedata/src/androidTest/java/androidx/compose/runtime/livedata/LiveDataAdapterTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.lifecycle.testing.TestLifecycleOwner
2828
import androidx.test.ext.junit.runners.AndroidJUnit4
2929
import androidx.test.filters.LargeTest
3030
import com.google.common.truth.Truth.assertThat
31+
import kotlinx.coroutines.test.StandardTestDispatcher
3132
import org.junit.Rule
3233
import org.junit.Test
3334
import org.junit.runner.RunWith
@@ -36,7 +37,7 @@ import org.junit.runner.RunWith
3637
@RunWith(AndroidJUnit4::class)
3738
class LiveDataAdapterTest {
3839

39-
@get:Rule val rule = createComposeRule()
40+
@get:Rule val rule = createComposeRule(StandardTestDispatcher())
4041

4142
@Test
4243
fun whenValueIsNotSetWeGotNull() {

‎compose/runtime/runtime-rxjava2/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ androidXMultiplatform {
3434
androidLibrary {
3535
compileSdk = 35
3636
namespace = "androidx.compose.runtime.rxjava2"
37-
lint.disable += "ComposeTestRuleDispatcher"
3837
}
3938
desktop()
4039

‎compose/runtime/runtime-rxjava2/src/androidInstrumentedTest/kotlin/androidx/compose/runtime/rxjava2/CompletableAdapterTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.test.filters.MediumTest
2222
import com.google.common.truth.Truth
2323
import io.reactivex.Completable
2424
import io.reactivex.CompletableEmitter
25+
import kotlinx.coroutines.test.StandardTestDispatcher
2526
import org.junit.Rule
2627
import org.junit.Test
2728
import org.junit.runner.RunWith
@@ -30,7 +31,7 @@ import org.junit.runner.RunWith
3031
@RunWith(AndroidJUnit4::class)
3132
class CompletableAdapterTest {
3233

33-
@get:Rule val rule = createComposeRule()
34+
@get:Rule val rule = createComposeRule(StandardTestDispatcher())
3435

3536
@Test
3637
fun whenNotCompletedSetWeGotFalse() {

‎compose/runtime/runtime-rxjava2/src/androidInstrumentedTest/kotlin/androidx/compose/runtime/rxjava2/RxJava2AdapterTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import io.reactivex.Single
3232
import io.reactivex.SingleEmitter
3333
import io.reactivex.SingleOnSubscribe
3434
import io.reactivex.subjects.BehaviorSubject
35+
import kotlinx.coroutines.test.StandardTestDispatcher
3536
import org.junit.Rule
3637
import org.junit.Test
3738
import org.junit.runner.RunWith
@@ -48,7 +49,7 @@ class RxJava2AdapterTest(private val factory: () -> Stream) {
4849
arrayOf(ObservableStream(), FlowableStream(), SingleStream(), MaybeStream())
4950
}
5051

51-
@get:Rule val rule = createComposeRule()
52+
@get:Rule val rule = createComposeRule(StandardTestDispatcher())
5253

5354
@Test
5455
fun whenValueIsNotSetWeGotNull() {

‎compose/runtime/runtime-rxjava3/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ androidXMultiplatform {
3434
androidLibrary {
3535
compileSdk = 35
3636
namespace = "androidx.compose.runtime.rxjava2"
37-
lint.disable += "ComposeTestRuleDispatcher"
3837
}
3938
desktop()
4039

‎compose/runtime/runtime-rxjava3/src/androidInstrumentedTest/kotlin/androidx/compose/runtime/rxjava3/CompletableAdapterTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.test.filters.MediumTest
2222
import com.google.common.truth.Truth
2323
import io.reactivex.rxjava3.core.Completable
2424
import io.reactivex.rxjava3.core.CompletableEmitter
25+
import kotlinx.coroutines.test.StandardTestDispatcher
2526
import org.junit.Rule
2627
import org.junit.Test
2728
import org.junit.runner.RunWith
@@ -30,7 +31,7 @@ import org.junit.runner.RunWith
3031
@RunWith(AndroidJUnit4::class)
3132
class CompletableAdapterTest {
3233

33-
@get:Rule val rule = createComposeRule()
34+
@get:Rule val rule = createComposeRule(StandardTestDispatcher())
3435

3536
@Test
3637
fun whenNotCompletedSetWeGotFalse() {

‎compose/runtime/runtime-rxjava3/src/androidInstrumentedTest/kotlin/androidx/compose/runtime/rxjava3/RxJava3AdapterTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import io.reactivex.rxjava3.core.Single
3232
import io.reactivex.rxjava3.core.SingleEmitter
3333
import io.reactivex.rxjava3.core.SingleOnSubscribe
3434
import io.reactivex.rxjava3.subjects.BehaviorSubject
35+
import kotlinx.coroutines.test.StandardTestDispatcher
3536
import org.junit.Rule
3637
import org.junit.Test
3738
import org.junit.runner.RunWith
@@ -48,7 +49,7 @@ class RxJava3AdapterTest(private val factory: () -> Stream) {
4849
arrayOf(ObservableStream(), FlowableStream(), SingleStream(), MaybeStream())
4950
}
5051

51-
@get:Rule val rule = createComposeRule()
52+
@get:Rule val rule = createComposeRule(StandardTestDispatcher())
5253

5354
@Test
5455
fun whenValueIsNotSetWeGotNull() {

‎compose/runtime/runtime-saveable/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ androidXMultiplatform {
3636
compileSdk = 35
3737
namespace = "androidx.compose.runtime.saveable"
3838
androidResources.enable = true
39-
lint.disable += "ComposeTestRuleDispatcher"
4039
}
4140
desktop()
4241
mingwX64()

‎compose/runtime/runtime-saveable/src/androidInstrumentedTest/kotlin/androidx/compose/runtime/saveable/RememberSaveableTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import androidx.test.filters.MediumTest
2929
import com.google.common.truth.Truth.assertThat
3030
import java.util.concurrent.CountDownLatch
3131
import java.util.concurrent.TimeUnit
32+
import kotlinx.coroutines.test.StandardTestDispatcher
3233
import org.junit.Assert.assertEquals
3334
import org.junit.Assert.assertTrue
3435
import org.junit.Rule
@@ -39,7 +40,7 @@ import org.junit.runner.RunWith
3940
@RunWith(AndroidJUnit4::class)
4041
class RememberSaveableTest {
4142

42-
@get:Rule val rule = createComposeRule()
43+
@get:Rule val rule = createComposeRule(StandardTestDispatcher())
4344

4445
private val restorationTester = StateRestorationTester(rule)
4546

0 commit comments

Comments
 (0)