From a7f91550fba113627581a71fed07879ccf087629 Mon Sep 17 00:00:00 2001 From: Pallavi Ganorkar Date: Tue, 26 Apr 2022 20:20:16 +0530 Subject: [PATCH 1/3] Flakey Test case fixed --- .../fhir/datacapture/utilities/AutoCompleteTextViewAction.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/utilities/AutoCompleteTextViewAction.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/utilities/AutoCompleteTextViewAction.kt index b38e2a6a0a..a937610f49 100644 --- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/utilities/AutoCompleteTextViewAction.kt +++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/utilities/AutoCompleteTextViewAction.kt @@ -38,7 +38,7 @@ fun showDropDown(): ViewAction { override fun perform(uiController: UiController, view: View?) { val autoCompleteTextView = view as AutoCompleteTextView autoCompleteTextView.showDropDown() - uiController.loopMainThreadUntilIdle() + uiController.loopMainThreadForAtLeast(100) } } } From 22c6e451043cf2485c91b49e6158084c63b82bd7 Mon Sep 17 00:00:00 2001 From: Pallavi Ganorkar Date: Tue, 26 Apr 2022 20:26:13 +0530 Subject: [PATCH 2/3] Flakey Test case fixed --- .../QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt index 6ab0253436..2ce36dcc57 100644 --- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt +++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt @@ -73,7 +73,6 @@ class QuestionnaireItemDropDownViewHolderFactoryEspressoTest { } @Test - @Ignore("https://github.com/google/android-fhir/issues/1323") fun shouldSetDropDownValueToAutoCompleteTextView() { val questionnaireItemViewItem = QuestionnaireItemViewItem( From c93c73a40b427867e1d437270e54ff59861c48e9 Mon Sep 17 00:00:00 2001 From: Pallavi Ganorkar Date: Wed, 27 Apr 2022 09:23:00 +0530 Subject: [PATCH 3/3] Spotless check applied --- .../QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt index 2ce36dcc57..ada297ebf1 100644 --- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt +++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt @@ -36,7 +36,6 @@ import org.hl7.fhir.r4.model.Coding import org.hl7.fhir.r4.model.Questionnaire import org.hl7.fhir.r4.model.QuestionnaireResponse import org.junit.Before -import org.junit.Ignore import org.junit.Rule import org.junit.Test