Clean up AppPermissionSummaryJavaTest

Kotlin Robolectric test could be directly run.

Bug: 236346018
Test: m RunSettingsRoboTests
Change-Id: I0a520236191655d01f2c4b81454627a73a271da5
This commit is contained in:
Chaohui Wang
2022-10-12 16:01:52 +08:00
parent b0bef1c529
commit 2fc09c5117
2 changed files with 5 additions and 29 deletions

View File

@@ -1,24 +0,0 @@
/*
* Copyright (C) 2022 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.spa.app.appsettings;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
// TODO: Remove this class when Kotlin is supported by the Robolectric test.
@RunWith(RobolectricTestRunner.class)
public class AppPermissionSummaryJavaTest extends AppPermissionSummaryTest {
}

View File

@@ -49,7 +49,7 @@ import org.mockito.Mockito.`when` as whenever
@RunWith(RobolectricTestRunner::class)
@Config(shadows = [ShadowPermissionsSummaryHelper::class])
open class AppPermissionSummaryTest {
class AppPermissionSummaryTest {
@JvmField
@Rule
@@ -75,8 +75,8 @@ open class AppPermissionSummaryTest {
}
@Test
open fun permissionsChangeListener() {
summaryLiveData.getOrAwaitValue() {
fun permissionsChangeListener() {
summaryLiveData.getOrAwaitValue {
verify(packageManager).addOnPermissionsChangeListener(any())
verify(packageManager, never()).removeOnPermissionsChangeListener(any())
}
@@ -109,7 +109,7 @@ open class AppPermissionSummaryTest {
}
@Test
open fun onPermissionSummaryResult_hasRuntimePermission_shouldSetPermissionAsSummary() {
fun onPermissionSummaryResult_hasRuntimePermission_shouldSetPermissionAsSummary() {
ShadowPermissionsSummaryHelper.requestedPermissionCount = 1
ShadowPermissionsSummaryHelper.grantedGroupLabels = listOf(PERMISSION)
@@ -120,7 +120,7 @@ open class AppPermissionSummaryTest {
}
@Test
open fun onPermissionSummaryResult_hasAdditionalPermission_shouldSetAdditionalSummary() {
fun onPermissionSummaryResult_hasAdditionalPermission_shouldSetAdditionalSummary() {
ShadowPermissionsSummaryHelper.requestedPermissionCount = 5
ShadowPermissionsSummaryHelper.additionalGrantedPermissionCount = 2
ShadowPermissionsSummaryHelper.grantedGroupLabels = listOf(PERMISSION)