From 2fc09c511793edc46104f521daadb781483870c7 Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Wed, 12 Oct 2022 16:01:52 +0800
Subject: [PATCH] Clean up AppPermissionSummaryJavaTest

Kotlin Robolectric test could be directly run.

Bug: 236346018
Test: m RunSettingsRoboTests
Change-Id: I0a520236191655d01f2c4b81454627a73a271da5
---
 .../AppPermissionSummaryJavaTest.java         | 24 -------------------
 .../appsettings/AppPermissionSummaryTest.kt   | 10 ++++----
 2 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryJavaTest.java

diff --git a/tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryJavaTest.java b/tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryJavaTest.java
deleted file mode 100644
index d0ee6adb97c..00000000000
--- a/tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryJavaTest.java
+++ /dev/null
@@ -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 {
-}
diff --git a/tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryTest.kt b/tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryTest.kt
index f09e4fa692b..35cdc0326f8 100644
--- a/tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryTest.kt
+++ b/tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryTest.kt
@@ -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)