Use assertThrows<***Exception> to replace @Test(expected = ***Exception::class) in ProcessCameraProviderTest.kt
Bug: 161412575
Test: ProcessCameraProviderTest.kt
Change-Id: If664b3366485f5faa6a71722c84174e101e94a8e
diff --git a/camera/camera-lifecycle/src/androidTest/java/androidx/camera/lifecycle/ProcessCameraProviderTest.kt b/camera/camera-lifecycle/src/androidTest/java/androidx/camera/lifecycle/ProcessCameraProviderTest.kt
index 72fe277..6c5cc189 100644
--- a/camera/camera-lifecycle/src/androidTest/java/androidx/camera/lifecycle/ProcessCameraProviderTest.kt
+++ b/camera/camera-lifecycle/src/androidTest/java/androidx/camera/lifecycle/ProcessCameraProviderTest.kt
@@ -323,7 +323,7 @@
}
}
- @Test(expected = IllegalArgumentException::class)
+ @Test
fun exception_withDestroyedLifecycle() {
ProcessCameraProvider.configureInstance(FakeAppConfig.create())
@@ -332,7 +332,9 @@
lifecycleOwner0.destroy()
- provider.bindToLifecycle(lifecycleOwner0, CameraSelector.DEFAULT_BACK_CAMERA)
+ assertThrows<IllegalArgumentException> {
+ provider.bindToLifecycle(lifecycleOwner0, CameraSelector.DEFAULT_BACK_CAMERA)
+ }
}
}
@@ -355,7 +357,7 @@
}
}
- @Test(expected = java.lang.IllegalArgumentException::class)
+ @Test
fun bindUseCases_withDifferentLensFacingButSameLifecycleOwner() {
ProcessCameraProvider.configureInstance(FakeAppConfig.create())
@@ -367,7 +369,13 @@
provider.bindToLifecycle(lifecycleOwner0, CameraSelector.DEFAULT_BACK_CAMERA, useCase0)
- provider.bindToLifecycle(lifecycleOwner0, CameraSelector.DEFAULT_FRONT_CAMERA, useCase1)
+ assertThrows<IllegalArgumentException> {
+ provider.bindToLifecycle(
+ lifecycleOwner0,
+ CameraSelector.DEFAULT_FRONT_CAMERA,
+ useCase1
+ )
+ }
}
}
@@ -391,7 +399,7 @@
}
}
- @Test(expected = java.lang.IllegalArgumentException::class)
+ @Test
fun bindUseCases_withNotExistedLensFacingCamera() {
val cameraFactoryProvider =
CameraFactory.Provider { _: Context?, _: CameraThreadConfig? ->
@@ -425,7 +433,13 @@
// The front camera is not defined, we should get the IllegalArgumentException when it
// tries to get the camera.
- provider.bindToLifecycle(lifecycleOwner0, CameraSelector.DEFAULT_FRONT_CAMERA, useCase)
+ assertThrows<IllegalArgumentException> {
+ provider.bindToLifecycle(
+ lifecycleOwner0,
+ CameraSelector.DEFAULT_FRONT_CAMERA,
+ useCase
+ )
+ }
}
}