Эх сурвалжийг харах

Add Schedulers.trampoline() to SchedulerHandlers

so the response from FakeCallRecordingRepository is received in CallRecordingViewModelTest

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Marcel Hibbe 2 жил өмнө
parent
commit
724f41a3be

+ 2 - 2
app/src/test/java/com/nextcloud/talk/test/fakes/FakeCallRecordingRepository.kt

@@ -31,12 +31,12 @@ class FakeCallRecordingRepository : CallRecordingRepository {
     override fun startRecording(
     override fun startRecording(
         roomToken: String
         roomToken: String
     ): Observable<StartCallRecordingModel> {
     ): Observable<StartCallRecordingModel> {
-        return Observable.just<StartCallRecordingModel>(StartCallRecordingModel(true))
+        return Observable.just(StartCallRecordingModel(true))
     }
     }
 
 
     override fun stopRecording(
     override fun stopRecording(
         roomToken: String
         roomToken: String
     ): Observable<StopCallRecordingModel> {
     ): Observable<StopCallRecordingModel> {
-        return Observable.just<StopCallRecordingModel>(StopCallRecordingModel(true))
+        return Observable.just(StopCallRecordingModel(true))
     }
     }
 }
 }

+ 11 - 0
app/src/test/java/com/nextcloud/talk/viewmodels/AbstractViewModelTest.kt

@@ -2,6 +2,7 @@ package com.nextcloud.talk.viewmodels
 
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import io.reactivex.android.plugins.RxAndroidPlugins
 import io.reactivex.android.plugins.RxAndroidPlugins
+import io.reactivex.plugins.RxJavaPlugins
 import io.reactivex.schedulers.Schedulers
 import io.reactivex.schedulers.Schedulers
 import org.junit.BeforeClass
 import org.junit.BeforeClass
 import org.junit.Rule
 import org.junit.Rule
@@ -14,6 +15,16 @@ open class AbstractViewModelTest {
         @JvmStatic
         @JvmStatic
         @BeforeClass
         @BeforeClass
         fun setUpClass() {
         fun setUpClass() {
+            RxJavaPlugins.setIoSchedulerHandler {
+                Schedulers.trampoline()
+            }
+            RxJavaPlugins.setComputationSchedulerHandler {
+                Schedulers.trampoline()
+            }
+            RxJavaPlugins.setNewThreadSchedulerHandler {
+                Schedulers.trampoline()
+            }
+
             RxAndroidPlugins.setInitMainThreadSchedulerHandler {
             RxAndroidPlugins.setInitMainThreadSchedulerHandler {
                 Schedulers.trampoline()
                 Schedulers.trampoline()
             }
             }

+ 2 - 2
app/src/test/java/com/nextcloud/talk/viewmodels/CallRecordingViewModelTest.kt

@@ -8,7 +8,7 @@ import org.mockito.MockitoAnnotations
 
 
 class CallRecordingViewModelTest : AbstractViewModelTest() {
 class CallRecordingViewModelTest : AbstractViewModelTest() {
 
 
-    val repository = FakeCallRecordingRepository()
+    private val repository = FakeCallRecordingRepository()
 
 
     @Before
     @Before
     fun setUp() {
     fun setUp() {
@@ -38,7 +38,7 @@ class CallRecordingViewModelTest : AbstractViewModelTest() {
 
 
         viewModel.stopRecording()
         viewModel.stopRecording()
 
 
-        Assert.equals(CallRecordingViewModel.RecordingStopLoadingState, viewModel.viewState.value)
+        Assert.equals(CallRecordingViewModel.RecordingStoppedState, viewModel.viewState.value)
     }
     }
 
 
     @Test
     @Test