commit cdea4dd5f4e9940b28468e3251bcd93426180894
author Igor Murashkin <iam@google.com> Fri Sep 20 19:08:56 2013 -0700
committer Igor Murashkin <iam@google.com> Fri Sep 20 19:08:56 2013 -0700
tree d3b8f98c43953043d31b0fe0d0af550344aac68b
parent b1608f1c3e1794a193e1ea6b10b9aef73ccbba40

camera2: Update onCaptureFailed api to include CaptureFailure

* Also minor adjustments to mockito matcher rules to be more specific

Bug: 10360518
Change-Id: I1c559e5ba126bf7f3de4057749d1e95383db256a

tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
index 818a98e..98f0778 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
@@ -22,6 +22,7 @@
 import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.CameraMetadata;
 import android.hardware.camera2.CameraProperties;
+import android.hardware.camera2.CaptureFailure;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
 import android.media.Image;
@@ -382,7 +383,7 @@
         }
 
         int expectedCaptureResultCount = repeating ? REPEATING_CAPTURE_EXPECTED_RESULT_COUNT : 1;
-        verifyCaptureResults(mockCaptureListener, expectedCaptureResultCount);
+        verifyCaptureResults(camera, mockCaptureListener, expectedCaptureResultCount);
 
         if (repeating) {
             camera.stopRepeating();
@@ -423,7 +424,7 @@
             expectedResultCount *= REPEATING_CAPTURE_EXPECTED_RESULT_COUNT;
         }
 
-        verifyCaptureResults(mockCaptureListener, expectedResultCount);
+        verifyCaptureResults(camera, mockCaptureListener, expectedResultCount);
 
         if (repeating) {
             camera.stopRepeating();
@@ -470,19 +471,21 @@
     }
 
     private void verifyCaptureResults(
+            CameraDevice camera,
             CameraDevice.CaptureListener mockListener,
             int expectResultCount) {
         // Should receive expected number of capture results.
         verify(mockListener,
                 timeout(CAPTURE_WAIT_TIMEOUT_MS).atLeast(expectResultCount))
                         .onCaptureCompleted(
-                                any(CameraDevice.class),
-                                any(CaptureRequest.class),
+                                eq(camera),
+                                isA(CaptureRequest.class),
                                 argThat(new IsCameraMetadataNotEmpty<CaptureResult>()));
         // Should not receive any capture failed callbacks.
         verify(mockListener, never())
                         .onCaptureFailed(
-                                any(CameraDevice.class),
-                                argThat(new IsCameraMetadataNotEmpty<CaptureRequest>()));
+                                eq(camera),
+                                argThat(new IsCameraMetadataNotEmpty<CaptureRequest>()),
+                                isA(CaptureFailure.class));
     }
 }