summaryrefslogtreecommitdiff
path: root/tests/apex
diff options
context:
space:
mode:
author Simon Wingrove <simonjw@google.com> 2023-02-02 08:57:37 +0000
committer Simon Wingrove <simonjw@google.com> 2023-02-02 10:38:02 +0000
commit40c83d56f4f5efb8086ac74ddecdf894373dada8 (patch)
tree6b37258fa7f6c7bbf149309a9fdfaec9858c0f90 /tests/apex
parent747059a9eba7db78fa222371c2be5f3959f316b1 (diff)
Apply ktfmt to all tests
Test: builds Relnote: N/A Bug: 261033020 Change-Id: Ib525b3ec794e44149793efb766c62ab72b5a5927
Diffstat (limited to 'tests/apex')
-rw-r--r--tests/apex/java/com/android/permission/persistence/RuntimePermissionsPersistenceTest.kt31
-rw-r--r--tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt18
2 files changed, 27 insertions, 22 deletions
diff --git a/tests/apex/java/com/android/permission/persistence/RuntimePermissionsPersistenceTest.kt b/tests/apex/java/com/android/permission/persistence/RuntimePermissionsPersistenceTest.kt
index 961606d13..a3502a01a 100644
--- a/tests/apex/java/com/android/permission/persistence/RuntimePermissionsPersistenceTest.kt
+++ b/tests/apex/java/com/android/permission/persistence/RuntimePermissionsPersistenceTest.kt
@@ -24,6 +24,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession
import com.google.common.truth.Truth.assertThat
+import java.io.File
import org.junit.After
import org.junit.Before
import org.junit.Test
@@ -35,7 +36,6 @@ import org.mockito.Mockito.`when`
import org.mockito.MockitoAnnotations.initMocks
import org.mockito.MockitoSession
import org.mockito.quality.Strictness
-import java.io.File
@RunWith(AndroidJUnit4::class)
class RuntimePermissionsPersistenceTest {
@@ -44,15 +44,17 @@ class RuntimePermissionsPersistenceTest {
private lateinit var mockDataDirectory: File
private lateinit var mockitoSession: MockitoSession
- @Mock
- lateinit var apexEnvironment: ApexEnvironment
+ @Mock lateinit var apexEnvironment: ApexEnvironment
private val persistence = RuntimePermissionsPersistence.createInstance()
private val permissionState = RuntimePermissionsState.PermissionState("permission", true, 3)
- private val state = RuntimePermissionsState(
- 1, "fingerprint", mapOf("package" to listOf(permissionState)),
- mapOf("sharedUser" to listOf(permissionState))
- )
+ private val state =
+ RuntimePermissionsState(
+ 1,
+ "fingerprint",
+ mapOf("package" to listOf(permissionState)),
+ mapOf("sharedUser" to listOf(permissionState))
+ )
private val user = Process.myUserHandle()
@Before
@@ -64,10 +66,11 @@ class RuntimePermissionsPersistenceTest {
@Before
fun mockApexEnvironment() {
initMocks(this)
- mockitoSession = mockitoSession()
- .mockStatic(ApexEnvironment::class.java)
- .strictness(Strictness.LENIENT)
- .startMocking()
+ mockitoSession =
+ mockitoSession()
+ .mockStatic(ApexEnvironment::class.java)
+ .strictness(Strictness.LENIENT)
+ .startMocking()
`when`(ApexEnvironment.getApexEnvironment(eq(APEX_MODULE_NAME))).thenReturn(apexEnvironment)
`when`(apexEnvironment.getDeviceProtectedDataDirForUser(any(UserHandle::class.java))).then {
File(mockDataDirectory, it.arguments[0].toString()).also { it.mkdirs() }
@@ -91,8 +94,10 @@ class RuntimePermissionsPersistenceTest {
fun testWriteCorruptReadFromReserveCopy() {
persistence.writeForUser(state, user)
// Corrupt the primary file.
- RuntimePermissionsPersistenceImpl.getFile(user).writeText(
- "<runtime-permissions version=\"10\"><package name=\"com.foo.bar\"><permission")
+ RuntimePermissionsPersistenceImpl.getFile(user)
+ .writeText(
+ "<runtime-permissions version=\"10\"><package name=\"com.foo.bar\"><permission"
+ )
val persistedState = persistence.readForUser(user)
checkPersistedState(persistedState!!)
diff --git a/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt b/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt
index 68249e6f1..814826b98 100644
--- a/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt
+++ b/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt
@@ -24,6 +24,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession
import com.google.common.truth.Truth.assertThat
+import java.io.File
import org.junit.After
import org.junit.Before
import org.junit.Test
@@ -35,7 +36,6 @@ import org.mockito.Mockito.`when`
import org.mockito.MockitoAnnotations.initMocks
import org.mockito.MockitoSession
import org.mockito.quality.Strictness
-import java.io.File
@RunWith(AndroidJUnit4::class)
class RolesPersistenceTest {
@@ -44,8 +44,7 @@ class RolesPersistenceTest {
private lateinit var mockDataDirectory: File
private lateinit var mockitoSession: MockitoSession
- @Mock
- lateinit var apexEnvironment: ApexEnvironment
+ @Mock lateinit var apexEnvironment: ApexEnvironment
private val persistence = RolesPersistence.createInstance()
private val state = RolesState(1, "packagesHash", mapOf("role" to setOf("holder1", "holder2")))
@@ -60,10 +59,11 @@ class RolesPersistenceTest {
@Before
fun mockApexEnvironment() {
initMocks(this)
- mockitoSession = mockitoSession()
- .mockStatic(ApexEnvironment::class.java)
- .strictness(Strictness.LENIENT)
- .startMocking()
+ mockitoSession =
+ mockitoSession()
+ .mockStatic(ApexEnvironment::class.java)
+ .strictness(Strictness.LENIENT)
+ .startMocking()
`when`(ApexEnvironment.getApexEnvironment(eq(APEX_MODULE_NAME))).thenReturn(apexEnvironment)
`when`(apexEnvironment.getDeviceProtectedDataDirForUser(any(UserHandle::class.java))).then {
File(mockDataDirectory, it.arguments[0].toString()).also { it.mkdirs() }
@@ -87,8 +87,8 @@ class RolesPersistenceTest {
fun testWriteCorruptReadFromReserveCopy() {
persistence.writeForUser(state, user)
// Corrupt the primary file.
- RolesPersistenceImpl.getFile(user).writeText(
- "<roles version=\"-1\"><role name=\"com.foo.bar\"><holder")
+ RolesPersistenceImpl.getFile(user)
+ .writeText("<roles version=\"-1\"><role name=\"com.foo.bar\"><holder")
val persistedState = persistence.readForUser(user)
checkPersistedState(persistedState!!)