Merge "Clean up AppPermissionSummaryJavaTest" (5f018230) · Commits · e / os / android_packages_apps_Settings

tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryJavaTest.java

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		/*
		* 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 {
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -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)