commit 2f60374c2940d55d71e5b8ef21c6014cedd46ad6
author Trevor McGuire <trevormcguire@google.com> Sat Sep 17 05:17:46 2022 +0000
committer Trevor McGuire <trevormcguire@google.com> Mon Sep 19 18:18:32 2022 +0000
tree 6bb995ac380ffc3e33865087c28ff630345a24a4
parent 6fca4988a1cae2e42879702f024698e1b049e7f8

Migrate camera to mockito 4

 Updates camera testing code to rely on Mockito 4.8.0

 Removes @Ignored annotations from tests affected by b/239752223

Bug: 239752223
Test: @Ignored camera tests now pass
Change-Id: I033a7404c38e50d216924eda109032fd4a754123

gradle/libs.versions.toml

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 89ce06f..96c69fa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -170,6 +170,7 @@
 metalava = { module = "com.android.tools.metalava:metalava", version.ref = "metalava" }
 mlkitBarcode = { module = "com.google.mlkit:barcode-scanning", version = "17.0.2" }
 mockitoCore = { module = "org.mockito:mockito-core", version.ref = "mockito" }
+mockitoCore4 = { module = "org.mockito:mockito-core", version = "4.8.0" }
 mockitoAndroid = { module = "org.mockito:mockito-android", version.ref = "mockito" }
 mockitoKotlin = { module = "com.nhaarman.mockitokotlin2:mockito-kotlin", version = "2.1.0" }
 mockitoKotlin4 = { module = "org.mockito.kotlin:mockito-kotlin", version = "4.0.0" }