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

Commit 249e3c88 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Run PermissionAppsFragmentTest for storage and location too 

Test: atest PermissionControllerHostTests
Bug: 153792195
Change-Id: Ib772d83eb8c4b315f66aa8bd8f74c1343a8ec843
parent 118b53d1

tests/unit/AndroidTest.xml

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="push-file" key="CtsAppThatRequestsLocationPermission29.apk"

                value="/data/local/tmp/permissioncontroller/tests/unit/AppThatRequestsLocation.apk" />

        <option name="push-file" key="AppThatUsesStoragePermission.apk"

                value="/data/local/tmp/permissioncontroller/tests/unit/AppThatUsesStoragePermission.apk" />

        <option name="push-file" key="AppThatDefinesAdditionalPermission.apk"

                value="/data/local/tmp/permissioncontroller/tests/unit/AppThatDefinesAdditionalPermission.apk" />

        <option name="push-file" key="AppThatUsesAdditionalPermission.apk"

tests/unit/AppThatUsesStoragePermission/Android.bp

0 → 100644
+23 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2020 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.

//



android_test_helper_app {

    name: "AppThatUsesStoragePermission",



    sdk_version: "current",



    test_suites: [ "device-tests" ],

}

tests/unit/AppThatUsesStoragePermission/AndroidManifest.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2020 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.

  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.permissioncontroller.tests.appthatrequestpermission">



    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />



    <application />

</manifest>

tests/unit/src/com/android/permissioncontroller/ui/handheld/PermissionAppsFragmentTest.kt

+66 −33
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.permissioncontroller.ui.handheld



import android.Manifest.permission.ACCESS_COARSE_LOCATION

import android.Manifest.permission.READ_EXTERNAL_STORAGE

import android.content.Intent

import android.content.Intent.ACTION_MANAGE_PERMISSION_APPS

import android.content.Intent.EXTRA_PERMISSION_NAME
@@ -39,22 +41,17 @@ import org.junit.Test 
import org.junit.runner.RunWith



/**

 * Simple tests for {@link PermissionAppsFragment}

 * Superclass of all tests for {@link PermissionAppsFragmentTest}.

 *

 * <p>Leave abstract to prevent the test runner from trying to run it

 */

@RunWith(AndroidJUnit4::class)

class PermissionAppsFragmentTest {

    private val ADDITIONAL_DEFINER_APK =

            "/data/local/tmp/permissioncontroller/tests/unit/AppThatDefinesAdditionalPermission.apk"

    private val ADDITIONAL_USER_APK =

            "/data/local/tmp/permissioncontroller/tests/unit/" +

                    "AppThatUsesAdditionalPermission.apk"

    private val ADDITIONAL_DEFINER_PKG =

            "com.android.permissioncontroller.tests.appthatdefinespermission"

    private val ADDITIONAL_USER_PKG =

            "com.android.permissioncontroller.tests.appthatrequestpermission"



    private val PERM = "com.android.permissioncontroller.tests.A"



abstract class PermissionAppsFragmentTest(

    val userApk: String,

    val userPkg: String,

    val perm: String,

    val definerApk: String? = null,

    val definerPkg: String? = null

) {

    @get:Rule

    val disableAnimations = DisableAnimationsRule()
@@ -62,10 +59,12 @@ class PermissionAppsFragmentTest { 
    val managePermissionsActivity = object : ActivityTestRule<ManagePermissionsActivity>(

            ManagePermissionsActivity::class.java) {

        override fun getActivityIntent() = Intent(ACTION_MANAGE_PERMISSION_APPS)

                .putExtra(EXTRA_PERMISSION_NAME, PERM)

                .putExtra(EXTRA_PERMISSION_NAME, perm)



        override fun beforeActivityLaunched() {

            install(ADDITIONAL_DEFINER_APK)

            if (definerApk != null) {

                install(definerApk)

            }

        }

    }
@@ -76,41 +75,75 @@ class PermissionAppsFragmentTest { 


    @Test

    fun appAppearsWhenInstalled() {

        assertDoesNotHavePreference(ADDITIONAL_USER_PKG)

        assertDoesNotHavePreference(userPkg)



        install(ADDITIONAL_USER_APK)

        install(userApk)

        eventually {

            scrollToPreference(ADDITIONAL_USER_PKG)

            scrollToPreference(userPkg)

        }

    }



    @Test

    fun appDisappearsWhenUninstalled() {

        assertDoesNotHavePreference(ADDITIONAL_USER_PKG)

        assertDoesNotHavePreference(userPkg)



        install(ADDITIONAL_USER_APK)

        install(userApk)

        eventually {

            scrollToPreference(ADDITIONAL_USER_PKG)

            scrollToPreference(userPkg)

        }



        uninstallApp(ADDITIONAL_USER_PKG)

        uninstallApp(userPkg)

        eventually {

            assertDoesNotHavePreference(ADDITIONAL_USER_PKG)

            assertDoesNotHavePreference(userPkg)

        }

    }



    @After

    fun uninstallTestApp() {

        if (definerPkg != null) {

            uninstallApp(definerPkg)

        }

        uninstallApp(userPkg)

    }

}



/**

 * Simple tests for {@link PermissionAppsFragment} when showing location permission

 */

@RunWith(AndroidJUnit4::class)

class LocationPermissionAppsFragmentTest : PermissionAppsFragmentTest(

    "/data/local/tmp/permissioncontroller/tests/unit/AppThatRequestsLocation.apk",

    "android.permission.cts.appthatrequestpermission",

    ACCESS_COARSE_LOCATION

)



/**

 * Simple tests for {@link PermissionAppsFragment} when showing location permission

 */

@RunWith(AndroidJUnit4::class)

class StoragePermissionAppsFragmentTest : PermissionAppsFragmentTest(

    "/data/local/tmp/permissioncontroller/tests/unit/AppThatUsesStoragePermission.apk",

    "com.android.permissioncontroller.tests.appthatrequestpermission",

    READ_EXTERNAL_STORAGE

)



/**

 * Simple tests for {@link PermissionAppsFragment} when showing custom permission

 */

@RunWith(AndroidJUnit4::class)

class CustomPermissionAppsFragmentTest : PermissionAppsFragmentTest(

    "/data/local/tmp/permissioncontroller/tests/unit/AppThatUsesAdditionalPermission.apk",

    "com.android.permissioncontroller.tests.appthatrequestpermission",

    "com.android.permissioncontroller.tests.A",

    "/data/local/tmp/permissioncontroller/tests/unit/AppThatDefinesAdditionalPermission.apk",

    "com.android.permissioncontroller.tests.appthatdefinespermission"

) {

    @Test

    fun fragmentIsClosedWhenPermissionIsRemoved() {

        uninstallApp(ADDITIONAL_DEFINER_APK)

        uninstallApp(definerApk!!)

        eventually {

            assertThat(findNavController(managePermissionsActivity.activity, R.id.nav_host_fragment)

                    .currentDestination).isNotEqualTo(R.id.permission_apps)

        }

    }



    @After

    fun uninstallTestApp() {

        uninstallApp(ADDITIONAL_DEFINER_PKG)

        uninstallApp(ADDITIONAL_USER_PKG)

    }

}