Fixes stats VM but some androidtests fail on prod

Author: JoseAlcerreca

app/build.gradle

@@ -7,7 +7,7 @@ android {
     compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
-        applicationId "com.example.android.architecture.blueprints.master"
+        applicationId "com.example.android.architecture.blueprints.reactive"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
         versionCode 1

app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsViewModel.kt

@@ -19,7 +19,10 @@ package com.example.android.architecture.blueprints.todoapp.statistics
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
+import com.example.android.architecture.blueprints.todoapp.data.Result
+import com.example.android.architecture.blueprints.todoapp.data.Result.Error
 import com.example.android.architecture.blueprints.todoapp.data.Result.Success
 import com.example.android.architecture.blueprints.todoapp.data.Task
 import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository
@@ -33,68 +36,30 @@ class StatisticsViewModel(
     private val tasksRepository: TasksRepository
 ) : ViewModel() {
 
-    private val _dataLoading = MutableLiveData<Boolean>()
-    val dataLoading: LiveData<Boolean> = _dataLoading
-
-    private val _error = MutableLiveData<Boolean>()
-    val error: LiveData<Boolean> = _error
-
-    /**
-     * Controls whether the stats are shown or a "No data" message.
-     */
-    private val _empty = MutableLiveData<Boolean>()
-    val empty: LiveData<Boolean> = _empty
-
-    private val _activeTasksPercent = MutableLiveData<Float>()
-    val activeTasksPercent: LiveData<Float> = _activeTasksPercent
-
-    private val _completedTasksPercent = MutableLiveData<Float>()
-    val completedTasksPercent: LiveData<Float> = _completedTasksPercent
-
-    private var activeTasks = 0
-
-    private var completedTasks = 0
-
-    init {
-        start()
+    private val tasks: LiveData<Result<List<Task>>> = tasksRepository.observeTasks()
+    private val _dataLoading = MutableLiveData<Boolean>(false)
+    private val stats: LiveData<StatsResult?> = tasks.map {
+        if (it is Success) {
+            getActiveAndCompletedStats(it.data)
+        } else {
+            null
+        }
     }
 
-    fun start() {
-        if (_dataLoading.value == true) {
-            return
-        }
-        _dataLoading.value = true
+    val activeTasksPercent = stats.map {
+        it?.activeTasksPercent ?: 0f }
+    val completedTasksPercent: LiveData<Float> = stats.map { it?.completedTasksPercent ?: 0f }
+    val dataLoading: LiveData<Boolean> = _dataLoading
+    val error: LiveData<Boolean> = tasks.map { it is Error }
+    val empty: LiveData<Boolean> = tasks.map { (it as? Success)?.data.isNullOrEmpty() }
 
+    fun refresh() {
+        _dataLoading.value = true
         wrapEspressoIdlingResource {
             viewModelScope.launch {
-                tasksRepository.getTasks().let { result ->
-                    if (result is Success) {
-                        _error.value = false
-                        computeStats(result.data)
-                    } else {
-                        _error.value = true
-                        activeTasks = 0
-                        completedTasks = 0
-                        computeStats(null)
-                    }
-                }
+                tasksRepository.refreshTasks()
+                _dataLoading.value = false
             }
         }
     }
-
-    fun refresh() {
-        start()
-    }
-
-    /**
-     * Called when new data is ready.
-     */
-    private fun computeStats(tasks: List<Task>?) {
-        getActiveAndCompletedStats(tasks).let {
-            _activeTasksPercent.value = it.activeTasksPercent
-            _completedTasksPercent.value = it.completedTasksPercent
-        }
-        _empty.value = tasks.isNullOrEmpty()
-        _dataLoading.value = false
-    }
 }

app/src/sharedTest/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsFragmentTest.kt

@@ -97,6 +97,7 @@ class StatisticsFragmentTest {
             .getString(R.string.statistics_active_tasks, 50.0f)
         val expectedCompletedTaskText = getApplicationContext<Context>()
             .getString(R.string.statistics_completed_tasks, 50.0f)
+        Thread.sleep(4000)
         // check that both info boxes are displayed and contain the correct info
         onView(withId(R.id.stats_active_text)).check(matches(isDisplayed()))
         onView(withId(R.id.stats_active_text)).check(matches(withText(expectedActiveTaskText)))

app/src/test/java/com/example/android/architecture/blueprints/todoapp/FakeFailingTasksRemoteDataSource.kt

@@ -17,6 +17,7 @@
 package com.example.android.architecture.blueprints.todoapp
 
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.liveData
 import com.example.android.architecture.blueprints.todoapp.data.Result
 import com.example.android.architecture.blueprints.todoapp.data.Task
 import com.example.android.architecture.blueprints.todoapp.data.source.TasksDataSource
@@ -31,15 +32,15 @@ object FakeFailingTasksRemoteDataSource : TasksDataSource {
     }
 
     override fun observeTasks(): LiveData<Result<List<Task>>> {
-        TODO("not implemented")
+        return liveData { emit(getTasks()) }
     }
 
     override suspend fun refreshTasks() {
         TODO("not implemented")
     }
 
     override fun observeTask(taskId: String): LiveData<Result<Task>> {
-        TODO("not implemented")
+        return liveData { emit(getTask(taskId)) }
     }
 
     override suspend fun refreshTask(taskId: String) {

app/src/test/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsViewModelTest.kt

@@ -60,9 +60,6 @@ class StatisticsViewModelTest {
     fun loadEmptyTasksFromRepository_EmptyResults() = mainCoroutineRule.runBlockingTest {
         // Given an initialized StatisticsViewModel with no tasks
 
-        // When loading of Tasks is requested
-        statisticsViewModel.start()
-
         // Then the results are empty
         assertThat(statisticsViewModel.empty.awaitNextValue()).isTrue()
     }
@@ -76,9 +73,6 @@ class StatisticsViewModelTest {
         val task4 = Task("Title4", "Description4", true)
         tasksRepository.addTasks(task1, task2, task3, task4)
 
-        // When loading of Tasks is requested
-        statisticsViewModel.start()
-
         // Then the results are not empty
         assertThat(statisticsViewModel.empty.awaitNextValue())
             .isFalse()
@@ -99,9 +93,6 @@ class StatisticsViewModelTest {
                 )
             )
 
-            // When statistics are loaded
-            errorViewModel.start()
-
             // Then an error message is shown
             assertThat(errorViewModel.empty.awaitNextValue()).isTrue()
             assertThat(errorViewModel.error.awaitNextValue()).isTrue()
@@ -113,7 +104,7 @@ class StatisticsViewModelTest {
         mainCoroutineRule.pauseDispatcher()
 
         // Load the task in the viewmodel
-        statisticsViewModel.start()
+        statisticsViewModel.refresh()
 
         // Then progress indicator is shown
         assertThat(statisticsViewModel.dataLoading.awaitNextValue()).isTrue()