PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create data store for safe search preference.

Browse Source 
Test: atest SupervisionSafeSearchPreferenceTest
Test: atest SupervisionWebContentFiltersScreenTest
Test: manually tested with physical device
Flag: android.app.supervision.flags.enable_web_content_filters_screen
Bug: 401568995
Change-Id: Ia9e3f73ac6e9efbe7933dc2958443e9fdb5b4422
This commit is contained in:
Xiaomiao Zhang
2025-03-17 21:15:09 +00:00
parent 2897cf5def
commit b7de2ba4a5
5 changed files with 177 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
tests/robotests/src/com/android/settings/supervision/SupervisionSafeSearchPreferenceTest.kt
View File

@@ -16,20 +16,33 @@
package com.android.settings.supervision
import android.content.Context
import android.provider.Settings
import android.provider.Settings.Secure.SEARCH_CONTENT_FILTERS_ENABLED
import android.provider.Settings.SettingNotFoundException
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.R
import com.android.settingslib.preference.createAndBindWidget
import com.android.settingslib.widget.SelectorWithWidgetPreference
import com.google.common.truth.Truth.assertThat
import org.junit.Assert.assertThrows
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
@RunWith(AndroidJUnit4::class)
class SupervisionSafeSearchPreferenceTest {
private val context: Context = ApplicationProvider.getApplicationContext()
private lateinit var dataStore: SupervisionSafeSearchDataStore
private lateinit var searchFilterOffPreference: SupervisionSearchFilterOffPreference
private lateinit var searchFilterOnPreference: SupervisionSearchFilterOnPreference
private val searchFilterOnPreference = SupervisionSearchFilterOnPreference()
private val searchFilterOffPreference = SupervisionSearchFilterOffPreference()
@Before
fun setUp() {
dataStore = SupervisionSafeSearchDataStore(context)
searchFilterOffPreference = SupervisionSearchFilterOffPreference(dataStore)
searchFilterOnPreference = SupervisionSearchFilterOnPreference(dataStore)
}
@Test
fun getTitle_filterOn() {
@@ -37,7 +50,6 @@ class SupervisionSafeSearchPreferenceTest {
.isEqualTo(R.string.supervision_web_content_filters_search_filter_on_title)
}
@Test
fun getSummary_filterOn() {
assertThat(searchFilterOnPreference.summary)
@@ -53,8 +65,60 @@ class SupervisionSafeSearchPreferenceTest {
@Test
fun getSummary_filterOff() {
assertThat(searchFilterOffPreference.summary)
.isEqualTo(
R.string.supervision_web_content_filters_search_filter_off_summary
.isEqualTo(R.string.supervision_web_content_filters_search_filter_off_summary)
}
@Test
fun filterOffIsChecked_whenNoValueIsSet() {
assertThrows(SettingNotFoundException::class.java) {
Settings.Secure.getInt(context.getContentResolver(), SEARCH_CONTENT_FILTERS_ENABLED)
}
assertThat(getFilterOnWidget().isChecked).isFalse()
assertThat(getFilterOffWidget().isChecked).isTrue()
}
@Test
fun filterOnIsChecked_whenPreviouslyEnabled() {
Settings.Secure.putInt(context.getContentResolver(), SEARCH_CONTENT_FILTERS_ENABLED, 1)
assertThat(getFilterOffWidget().isChecked).isFalse()
assertThat(getFilterOnWidget().isChecked).isTrue()
}
@Test
fun clickBlockExplicitSites_enablesFilter() {
Settings.Secure.putInt(context.getContentResolver(), SEARCH_CONTENT_FILTERS_ENABLED, 0)
val filterOnWidget = getFilterOnWidget()
assertThat(filterOnWidget.isChecked).isFalse()
filterOnWidget.performClick()
assertThat(
Settings.Secure.getInt(context.getContentResolver(), SEARCH_CONTENT_FILTERS_ENABLED)
)
.isEqualTo(1)
assertThat(filterOnWidget.isChecked).isTrue()
}
@Test
fun clickAllowAllSites_disablesFilter() {
Settings.Secure.putInt(context.getContentResolver(), SEARCH_CONTENT_FILTERS_ENABLED, 1)
val filterOffWidget = getFilterOffWidget()
assertThat(filterOffWidget.isChecked).isFalse()
filterOffWidget.performClick()
assertThat(
Settings.Secure.getInt(context.getContentResolver(), SEARCH_CONTENT_FILTERS_ENABLED)
)
.isEqualTo(0)
assertThat(filterOffWidget.isChecked).isTrue()
}
private fun getFilterOnWidget(): SelectorWithWidgetPreference {
return searchFilterOnPreference.createAndBindWidget(context)
}
private fun getFilterOffWidget(): SelectorWithWidgetPreference {
return searchFilterOffPreference.createAndBindWidget(context)
}
}

24
tests/robotests/src/com/android/settings/supervision/SupervisionWebContentFiltersScreenTest.kt
View File

@@ -89,4 +89,28 @@ class SupervisionWebContentFiltersScreenTest {
assertThat(allowAllSitesPreference.isChecked).isFalse()
}
}
@Test
@EnableFlags(Flags.FLAG_ENABLE_WEB_CONTENT_FILTERS_SCREEN)
fun switchSafeSearchPreferences() {
FragmentScenario.launchInContainer(supervisionWebContentFiltersScreen.fragmentClass())
.onFragment { fragment ->
val searchFilterOffPreference =
fragment.findPreference<SelectorWithWidgetPreference>(
SupervisionSearchFilterOffPreference.KEY
)!!
val searchFilterOnPreference =
fragment.findPreference<SelectorWithWidgetPreference>(
SupervisionSearchFilterOnPreference.KEY
)!!
assertThat(searchFilterOffPreference.isChecked).isTrue()
assertThat(searchFilterOnPreference.isChecked).isFalse()
searchFilterOnPreference.performClick()
assertThat(searchFilterOnPreference.isChecked).isTrue()
assertThat(searchFilterOffPreference.isChecked).isFalse()
}
}
}