Add test for auto-focus diastolic field

Author: Pratul Kalia

app/src/main/java/org/simple/clinic/bp/entry/BloodPressureEntrySheetController.kt

@@ -28,23 +28,21 @@ class BloodPressureEntrySheetController @Inject constructor(
     val replayedEvents = events.compose(ReportAnalyticsEvents()).replay().refCount()
 
     return Observable.merge(
-        systolicTextChanges(replayedEvents),
+        automaticDiastolicFocusChanges(replayedEvents),
         validationErrorResets(replayedEvents),
         bpValidationsAndSaves(replayedEvents))
   }
 
-  private fun systolicTextChanges(events: Observable<UiEvent>): Observable<UiChange> {
-    // TODO: This needs unit tests
-    return events
-        .ofType<BloodPressureSystolicTextChanged>()
-        .distinctUntilChanged()
+  private fun automaticDiastolicFocusChanges(events: Observable<UiEvent>): Observable<UiChange> {
+    return events.ofType<BloodPressureSystolicTextChanged>()
         .filter { shouldFocusDiastolic(it.systolic) }
+        .distinctUntilChanged()
         .map { { ui: Ui -> ui.changeFocusToDiastolic() } }
   }
 
   private fun shouldFocusDiastolic(systolicText: String): Boolean {
-    return (systolicText.length == 3 && systolicText.matches("^[12].*$".toRegex()))
-        || (systolicText.length == 2 && systolicText.matches("^[3-9].*$".toRegex()))
+    return (systolicText.length == 3 && systolicText.matches("^[123].*$".toRegex()))
+        || (systolicText.length == 2 && systolicText.matches("^[789].*$".toRegex()))
   }
 
   private fun validationErrorResets(events: Observable<UiEvent>): Observable<UiChange> {

app/src/test/java/org/simple/clinic/bp/entry/BloodPressureEntrySheetControllerTest.kt

@@ -8,13 +8,17 @@ import com.nhaarman.mockito_kotlin.verify
 import com.nhaarman.mockito_kotlin.whenever
 import io.reactivex.Single
 import io.reactivex.subjects.PublishSubject
+import junitparams.JUnitParamsRunner
+import junitparams.Parameters
 import org.junit.Before
 import org.junit.Test
+import org.junit.runner.RunWith
 import org.simple.clinic.bp.BloodPressureRepository
 import org.simple.clinic.patient.PatientMocker
 import org.simple.clinic.widgets.UiEvent
 import java.util.UUID
 
+@RunWith(JUnitParamsRunner::class)
 class BloodPressureEntrySheetControllerTest {
 
   private val sheet = mock<BloodPressureEntrySheet>()
@@ -33,6 +37,24 @@ class BloodPressureEntrySheetControllerTest {
         .subscribe { uiChange -> uiChange(sheet) }
   }
 
+  @Test
+  @Parameters(value = [
+    "90|true",
+    "120|true",
+    "300|true",
+    "66|false",
+    "44|false"
+  ])
+  fun `when valid systolic value is entered, move cursor to diastolic field automatically`(sampleSystolicBp: String, shouldMove: Boolean) {
+    uiEvents.onNext(BloodPressureEntrySheetCreated(patientUuid))
+    uiEvents.onNext(BloodPressureSystolicTextChanged(sampleSystolicBp))
+
+    when (shouldMove) {
+      true -> verify(sheet).changeFocusToDiastolic()
+      false -> verify(sheet, never()).changeFocusToDiastolic()
+    }
+  }
+
   @Test
   fun `when systolic is less than diastolic, show error`() {
     uiEvents.onNext(BloodPressureEntrySheetCreated(patientUuid))
@@ -90,6 +112,7 @@ class BloodPressureEntrySheetControllerTest {
 
   @Test
   fun `when systolic or diastolic values change, hide the error message`() {
+    uiEvents.onNext(BloodPressureEntrySheetCreated(patientUuid))
     uiEvents.onNext(BloodPressureSystolicTextChanged("12"))
     uiEvents.onNext(BloodPressureSystolicTextChanged("120"))
     uiEvents.onNext(BloodPressureSystolicTextChanged("130"))