Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68f0a4fc authored by Zhou Liu's avatar Zhou Liu
Browse files

[Device Supervision] Fix SupervisionDashboardScreenTest and add... 

[Device Supervision] Fix SupervisionDashboardScreenTest and add SupervisionPromoFooterPreference back to dashboard

Bug: b/399497788
Test: atest SupervisionDashboardScreenTest
Flag: android.app.supervision.flags.enable_supervision_settings_screen
Change-Id: Ic5f5c2d784fc1f703be8324e9a181c327816fc91
parent f58e5c22

src/com/android/settings/supervision/SupervisionDashboardScreen.kt

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.supervision 
import android.app.supervision.flags.Flags

import android.content.Context

import com.android.settings.R

import com.android.settings.supervision.ipc.SupervisionMessengerClient

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator
@@ -61,7 +62,7 @@ class SupervisionDashboardScreen : PreferenceScreenCreator { 
                +SupervisionWebContentFiltersScreen.KEY

            }

            +SupervisionPinManagementScreen.KEY

            // TODO(b/399497788) Add SupervisionPromoFooterPreference with messenger service tests

            +SupervisionPromoFooterPreference(SupervisionMessengerClient(context))

        }



    companion object {

tests/robotests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ android_robolectric_test { 
        "Settings-robo-testutils",

        "Settings-testutils2",

        "SettingsLib-robo-testutils",

        "SettingsLibIpc-testutils",

        "Settings_robolectric_meta_service_file",

        "aconfig_settings_flags_lib",

        "android.webkit.flags-aconfig-java",

tests/robotests/src/com/android/settings/supervision/SupervisionDashboardScreenTest.kt

+13 −2
Original line number Diff line number Diff line
@@ -26,20 +26,31 @@ import androidx.preference.Preference 
import androidx.test.core.app.ApplicationProvider

import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.settings.supervision.SupervisionMainSwitchPreference.Companion.REQUEST_CODE_CONFIRM_SUPERVISION_CREDENTIALS

import com.android.settings.supervision.ipc.SupervisionMessengerClient

import com.android.settingslib.ipc.MessengerServiceRule

import com.android.settingslib.widget.MainSwitchPreference

import com.google.common.truth.Truth.assertThat

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.robolectric.annotation.LooperMode



@RunWith(AndroidJUnit4::class)

@LooperMode(LooperMode.Mode.INSTRUMENTATION_TEST)

class SupervisionDashboardScreenTest {

    @get:Rule val setFlagsRule = SetFlagsRule()



    private val preferenceScreenCreator = SupervisionDashboardScreen()



    private val context: Context = ApplicationProvider.getApplicationContext()



    @get:Rule val setFlagsRule = SetFlagsRule()



    @get:Rule

    val serviceRule =

        MessengerServiceRule(

            TestSupervisionMessengerService::class.java,

            SupervisionMessengerClient(context),

        )



    @Test

    fun key() {

        assertThat(preferenceScreenCreator.key).isEqualTo(SupervisionDashboardScreen.KEY)

tests/robotests/src/com/android/settings/supervision/TestSupervisionMessengerService.kt

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.settings.supervision



import android.app.Application

import com.android.settings.supervision.ipc.PreferenceData

import com.android.settings.supervision.ipc.PreferenceDataApi

import com.android.settings.supervision.ipc.PreferenceDataRequest

import com.android.settingslib.ipc.ApiDescriptor

import com.android.settingslib.ipc.ApiHandler

import com.android.settingslib.ipc.MessengerService

import com.android.settingslib.ipc.PermissionChecker



class TestSupervisionMessengerService :

    MessengerService(listOf(TestPreferenceDataApiImp()), PermissionChecker { _, _, _ -> true })



class TestPreferenceDataApiImp :

    ApiHandler<PreferenceDataRequest, Map<String, PreferenceData>>,

    ApiDescriptor<PreferenceDataRequest, Map<String, PreferenceData>> by PreferenceDataApi() {

    @Volatile var hasPermission = true

    @Volatile var invokeException: Exception? = null

    @Volatile var preferenceData: Map<String, PreferenceData> = mapOf()



    override fun hasPermission(

        application: Application,

        callingPid: Int,

        callingUid: Int,

        request: PreferenceDataRequest,

    ): Boolean {

        return hasPermission

    }



    override suspend fun invoke(

        application: Application,

        callingPid: Int,

        callingUid: Int,

        request: PreferenceDataRequest,

    ): Map<String, PreferenceData> {

        invokeException?.let { throw it }

        return preferenceData

    }

}