1 files changed, 23 insertions, 23 deletions
diff --git a/apk/tests/src/com/android/healthconnect/controller/tests/permissions/connectedapps/ConnectedAppsFragmentTest.kt b/apk/tests/src/com/android/healthconnect/controller/tests/permissions/connectedapps/ConnectedAppsFragmentTest.kt
index b1f5a29e..ecf33a8e 100644
--- a/apk/tests/src/com/android/healthconnect/controller/tests/permissions/connectedapps/ConnectedAppsFragmentTest.kt
+++ b/apk/tests/src/com/android/healthconnect/controller/tests/permissions/connectedapps/ConnectedAppsFragmentTest.kt
@@ -20,7 +20,6 @@ import android.os.Bundle
 import androidx.lifecycle.MutableLiveData
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.scrollTo
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -153,14 +152,16 @@ class ConnectedAppsFragmentTest {
     }
 
     @Test
-    fun test_appPermissionsWithNoConnectedApps_isDisplayedCorrectly() {
+    fun testWithNoApps_bothFeedbackAndPlayStoreAvailable_bothShouldBeDisplayedInThingsToTryOptions() {
         val connectApp = listOf<ConnectedAppMetadata>()
         whenever(viewModel.connectedApps).then { MutableLiveData(connectApp) }
 
+        (deviceInfoUtils as FakeDeviceInfoUtils).setPlayStoreAvailability(true)
+        deviceInfoUtils.setSendFeedbackAvailability(true)
+
         launchFragment<ConnectedAppsFragment>(Bundle())
 
         onView(withText("You don't currently have any compatible apps installed"))
-            .perform(ViewActions.scrollTo())
             .check(matches(isDisplayed()))
         onView(withText("Things to try")).perform(scrollTo()).check(matches(isDisplayed()))
         onView(withText("Check for updates")).perform(scrollTo()).check(matches(isDisplayed()))
@@ -174,15 +175,26 @@ class ConnectedAppsFragmentTest {
             .perform(scrollTo())
             .check(matches(isDisplayed()))
         onView(withText("Send feedback")).perform(scrollTo()).check(matches(isDisplayed()))
-        onView(
-                withText(
-                    "Tell us which health & fitness apps you'd like to work with Health\u00A0Connect"))
-            .perform(scrollTo())
+    }
+
+    @Test
+    fun testWithNoApps_bothFeedbackAndPlayStoreAreNotAvailable_thingsToTryOptionsShouldNotBeDisplayed() {
+        val connectApp = listOf<ConnectedAppMetadata>()
+        whenever(viewModel.connectedApps).then { MutableLiveData(connectApp) }
+
+        (deviceInfoUtils as FakeDeviceInfoUtils).setPlayStoreAvailability(false)
+        deviceInfoUtils.setSendFeedbackAvailability(false)
+
+        launchFragment<ConnectedAppsFragment>(Bundle())
+
+        onView(withText("You don't currently have any compatible apps installed"))
             .check(matches(isDisplayed()))
-        onView(withText("Allowed access")).check(doesNotExist())
-        onView(withText("Not allowed access")).check(doesNotExist())
-        onView(withText("No apps denied")).check(doesNotExist())
-        onView(withText("Settings & help")).check(doesNotExist())
+        onView(withText("Things to try")).check(doesNotExist())
+        onView(withText("Check for updates")).check(doesNotExist())
+        onView(withText("Make sure installed apps are up-to-date")).check(doesNotExist())
+        onView(withText("See all compatible apps")).check(doesNotExist())
+        onView(withText("Find apps on Google\u00A0Play")).check(doesNotExist())
+        onView(withText("Send feedback")).check(doesNotExist())
     }
 
     @Test
@@ -206,18 +218,6 @@ class ConnectedAppsFragmentTest {
     }
 
     @Test
-    fun withNoApps_showsEmptyState() {
-        whenever(viewModel.connectedApps).then {
-            MutableLiveData(emptyList<ConnectedAppMetadata>())
-        }
-        launchFragment<ConnectedAppsFragment>(Bundle())
-
-        onView(withText("Send feedback")).check(matches(isDisplayed()))
-        onView(withText("See all compatible apps")).check(matches(isDisplayed()))
-        onView(withText("Check for updates")).check(matches(isDisplayed()))
-    }
-
-    @Test
     fun test_eitherFeedbackOrPlayStoreAvailable_helpAndFeedbackPreferenceShouldBeDisplayed() {
         val connectApp =
             listOf(