Removing checks for the Auto-delete button because it has been moved to

a different screen.

Fix: 321629746
Test: atest
Change-Id: Iee8c6d168b714c68da8eeaa9920a03a40f2b27f1

4 files changed, 0 insertions, 67 deletions

diff --git a/apk/tests/src/com/android/healthconnect/controller/tests/categories/HealthDataCategoriesFragmentTest.kt b/apk/tests/src/com/android/healthconnect/controller/tests/categories/HealthDataCategoriesFragmentTest.kt
index bf3ce733..445768c7 100644
--- a/apk/tests/src/com/android/healthconnect/controller/tests/categories/HealthDataCategoriesFragmentTest.kt
+++ b/apk/tests/src/com/android/healthconnect/controller/tests/categories/HealthDataCategoriesFragmentTest.kt
@@ -88,7 +88,6 @@ class HealthDataCategoriesFragmentTest {
 
         onView(withText("Browse data")).check(matches(isDisplayed()))
         onView(withText("Manage data")).check(matches(isDisplayed()))
-        onView(withText("Auto-delete")).check(matches(isDisplayed()))
         onView(withText("Off")).check(matches(isDisplayed()))
     }
 
@@ -215,50 +214,6 @@ class HealthDataCategoriesFragmentTest {
     }
 
     @Test
-    fun categoriesFragment_autoDeleteButton_displaysAutoDeleteRangeNever() {
-        whenever(viewModel.categoriesData).then {
-            MutableLiveData<CategoriesFragmentState>(WithData(emptyList()))
-        }
-        whenever(autoDeleteViewModel.storedAutoDeleteRange).then {
-            MutableLiveData(AutoDeleteState.WithData(AutoDeleteRange.AUTO_DELETE_RANGE_NEVER))
-        }
-        launchFragment<HealthDataCategoriesFragment>(Bundle())
-
-        onView(withText("Auto-delete")).check(matches(isDisplayed()))
-        onView(withText("Off")).check(matches(isDisplayed()))
-    }
-
-    @Test
-    fun categoriesFragment_autoDeleteButton_displaysAutoDeleteRange3Months() {
-        whenever(viewModel.categoriesData).then {
-            MutableLiveData<CategoriesFragmentState>(WithData(emptyList()))
-        }
-        whenever(autoDeleteViewModel.storedAutoDeleteRange).then {
-            MutableLiveData(
-                AutoDeleteState.WithData(AutoDeleteRange.AUTO_DELETE_RANGE_THREE_MONTHS))
-        }
-        launchFragment<HealthDataCategoriesFragment>(Bundle())
-
-        onView(withText("Auto-delete")).check(matches(isDisplayed()))
-        onView(withText("After 3 months")).check(matches(isDisplayed()))
-    }
-
-    @Test
-    fun categoriesFragment_autoDeleteButton_displaysAutoDeleteRange18Months() {
-        whenever(viewModel.categoriesData).then {
-            MutableLiveData<CategoriesFragmentState>(WithData(emptyList()))
-        }
-        whenever(autoDeleteViewModel.storedAutoDeleteRange).then {
-            MutableLiveData(
-                AutoDeleteState.WithData(AutoDeleteRange.AUTO_DELETE_RANGE_EIGHTEEN_MONTHS))
-        }
-        launchFragment<HealthDataCategoriesFragment>(Bundle())
-
-        onView(withText("Auto-delete")).check(matches(isDisplayed()))
-        onView(withText("After 18 months")).check(matches(isDisplayed()))
-    }
-
-    @Test
     fun categoriesFragment_loadingState_showsLoading() {
         whenever(viewModel.categoriesData).then {
             MutableLiveData<CategoriesFragmentState>(CategoriesFragmentState.Loading)
diff --git a/tests/cts/hostsidetests/healthconnect/HealthConnectTestHelper/src/android/healthconnect/cts/testhelper/HealthConnectUiTestHelper.kt b/tests/cts/hostsidetests/healthconnect/HealthConnectTestHelper/src/android/healthconnect/cts/testhelper/HealthConnectUiTestHelper.kt
index 3ec5ca62..152d7e50 100644
--- a/tests/cts/hostsidetests/healthconnect/HealthConnectTestHelper/src/android/healthconnect/cts/testhelper/HealthConnectUiTestHelper.kt
+++ b/tests/cts/hostsidetests/healthconnect/HealthConnectTestHelper/src/android/healthconnect/cts/testhelper/HealthConnectUiTestHelper.kt
@@ -97,7 +97,6 @@ class HealthConnectUiTestHelper {
 
             UiTestUtils.waitDisplayed(By.text("Browse data"))
             UiTestUtils.waitDisplayed(By.text("Manage data"))
-            UiTestUtils.waitDisplayed(By.text("Auto-delete"))
 
             UiTestUtils.waitDisplayed(By.text("Delete all data"))
         }
diff --git a/tests/cts/src/android/healthconnect/cts/ui/CategoriesFragmentTest.kt b/tests/cts/src/android/healthconnect/cts/ui/CategoriesFragmentTest.kt
index a653d712..e0f6d72b 100644
--- a/tests/cts/src/android/healthconnect/cts/ui/CategoriesFragmentTest.kt
+++ b/tests/cts/src/android/healthconnect/cts/ui/CategoriesFragmentTest.kt
@@ -72,26 +72,6 @@ class CategoriesFragmentTest : HealthConnectBaseTest() {
         }
     }
 
-    @Test
-    fun categoriesFragment_never_showsAutoDeleteOption() {
-        setAutoDeletePeriod(0)
-
-        context.launchDataActivity {
-            waitDisplayed(By.text("Auto-delete"))
-            waitDisplayed(By.text("Off"))
-        }
-    }
-
-    @Test
-    fun categoriesFragment_3months_showsAutoDeleteOption() {
-        setAutoDeletePeriod(THREE_MONTHS)
-
-        context.launchDataActivity {
-            waitDisplayed(By.text("Auto-delete"))
-            waitDisplayed(By.text("After 3 months"))
-        }
-    }
-
     // TODO(b/274920669) Fix flaky tests
     //    @Test
     //    fun categoriesFragment_deleteAllData() {
diff --git a/tests/cts/src/android/healthconnect/cts/ui/HomeFragmentTest.kt b/tests/cts/src/android/healthconnect/cts/ui/HomeFragmentTest.kt
index 57155387..5eb075ab 100644
--- a/tests/cts/src/android/healthconnect/cts/ui/HomeFragmentTest.kt
+++ b/tests/cts/src/android/healthconnect/cts/ui/HomeFragmentTest.kt
@@ -96,7 +96,6 @@ class HomeFragmentTest : HealthConnectBaseTest() {
 
             waitDisplayed(By.text("Browse data"))
             waitDisplayed(By.text("Manage data"))
-            waitDisplayed(By.text("Auto-delete"))
 
             waitDisplayed(By.text("Delete all data"))
         }