1 files changed, 62 insertions, 22 deletions
diff --git a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
index bb23e37..ea320a7 100644
--- a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
+++ b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
@@ -23,7 +23,8 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import android.hardware.camera2.CameraCaptureSession.CaptureListener;
+import android.graphics.Rect;
+import android.hardware.camera2.CameraCaptureSession.CaptureCallback;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureRequest.Key;
@@ -32,65 +33,65 @@ import android.view.Surface;
 import org.junit.Test;
 
 public class Camera2UtilsTest extends Camera2DeviceTester {
-    private void captureListenerSplitterAllCallbacksReceived(CaptureListener splitter,
-                                                             CaptureListener... terminals) {
+    private void captureListenerSplitterAllCallbacksReceived(CaptureCallback splitter,
+                                                             CaptureCallback... terminals) {
         splitter.onCaptureCompleted(null, null, null);
-        for (CaptureListener each : terminals) {
+        for (CaptureCallback each : terminals) {
             verify(each).onCaptureCompleted(null, null, null);
         }
         splitter.onCaptureFailed(null, null, null);
-        for (CaptureListener each : terminals) {
+        for (CaptureCallback each : terminals) {
             verify(each).onCaptureFailed(null, null, null);
         }
         splitter.onCaptureProgressed(null, null, null);
-        for (CaptureListener each : terminals) {
+        for (CaptureCallback each : terminals) {
             verify(each).onCaptureProgressed(null, null, null);
         }
         splitter.onCaptureSequenceAborted(null, 0);
-        for (CaptureListener each : terminals) {
+        for (CaptureCallback each : terminals) {
             verify(each).onCaptureSequenceAborted(null, 0);
         }
         splitter.onCaptureSequenceCompleted(null, 0, 0L);
-        for (CaptureListener each : terminals) {
+        for (CaptureCallback each : terminals) {
             verify(each).onCaptureSequenceCompleted(null, 0, 0L);
         }
-        splitter.onCaptureStarted(null, null, 0L);
-        for (CaptureListener each : terminals) {
-            verify(each).onCaptureStarted(null, null, 0L);
+        splitter.onCaptureStarted(null, null, 0L, 1L);
+        for (CaptureCallback each : terminals) {
+            verify(each).onCaptureStarted(null, null, 0L, 1L);
         }
     }
 
     @Test
     public void captureListenerSplitter() {
-        CaptureListener firstBackingListener = mock(CaptureListener.class);
-        CaptureListener secondBackingListener = mock(CaptureListener.class);
+        CaptureCallback firstBackingListener = mock(CaptureCallback.class);
+        CaptureCallback secondBackingListener = mock(CaptureCallback.class);
         captureListenerSplitterAllCallbacksReceived(
-                new Camera2CaptureListenerSplitter(firstBackingListener, secondBackingListener),
+                new Camera2CaptureCallbackSplitter(firstBackingListener, secondBackingListener),
                 firstBackingListener, secondBackingListener);
     }
 
     @Test
     public void captureListenerSplitterEmpty() {
-        captureListenerSplitterAllCallbacksReceived(new Camera2CaptureListenerSplitter());
+        captureListenerSplitterAllCallbacksReceived(new Camera2CaptureCallbackSplitter());
     }
 
     @Test
     public void captureListenerSplitterNoNpe() {
         captureListenerSplitterAllCallbacksReceived(
-                new Camera2CaptureListenerSplitter((CaptureListener) null));
+                new Camera2CaptureCallbackSplitter((CaptureCallback) null));
     }
 
     @Test
     public void captureListenerSplitterMultipleNulls() {
         captureListenerSplitterAllCallbacksReceived(
-                new Camera2CaptureListenerSplitter(null, null, null));
+                new Camera2CaptureCallbackSplitter(null, null, null));
     }
 
     @Test
     public void captureListenerSplitterValidAndNull() {
-        CaptureListener onlyRealBackingListener = mock(CaptureListener.class);
+        CaptureCallback onlyRealBackingListener = mock(CaptureCallback.class);
         captureListenerSplitterAllCallbacksReceived(
-                new Camera2CaptureListenerSplitter(null, onlyRealBackingListener),
+                new Camera2CaptureCallbackSplitter(null, onlyRealBackingListener),
                 onlyRealBackingListener);
     }
 
@@ -234,22 +235,61 @@ public class Camera2UtilsTest extends Camera2DeviceTester {
         setUp.get(null);
     }
 
+    @Test
+    public void requestSettingsSetMatchesPrimitives() {
+        Camera2RequestSettingsSet setUp = new Camera2RequestSettingsSet();
+        assertTrue(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, null));
+        assertFalse(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, false));
+        assertFalse(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, true));
+
+        setUp.set(CaptureRequest.CONTROL_AE_LOCK, null);
+        assertTrue(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, null));
+        assertFalse(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, false));
+        assertFalse(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, true));
+
+        setUp.set(CaptureRequest.CONTROL_AE_LOCK, false);
+        assertFalse(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, null));
+        assertTrue(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, false));
+        assertFalse(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, true));
+
+        setUp.set(CaptureRequest.CONTROL_AE_LOCK, true);
+        assertFalse(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, null));
+        assertFalse(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, false));
+        assertTrue(setUp.matches(CaptureRequest.CONTROL_AE_LOCK, true));
+    }
+
+    @Test
+    public void requestSettingsSetMatchesReferences() {
+        Camera2RequestSettingsSet setUp = new Camera2RequestSettingsSet();
+        assertTrue(setUp.matches(CaptureRequest.SCALER_CROP_REGION, null));
+        assertFalse(setUp.matches(CaptureRequest.SCALER_CROP_REGION, new Rect(0, 0, 0, 0)));
+
+        setUp.set(CaptureRequest.SCALER_CROP_REGION, null);
+        assertTrue(setUp.matches(CaptureRequest.SCALER_CROP_REGION, null));
+        assertFalse(setUp.matches(CaptureRequest.SCALER_CROP_REGION, new Rect(0, 0, 0, 0)));
+
+        setUp.set(CaptureRequest.SCALER_CROP_REGION, new Rect(0, 0, 0, 0));
+        assertFalse(setUp.matches(CaptureRequest.SCALER_CROP_REGION, null));
+        assertTrue(setUp.matches(CaptureRequest.SCALER_CROP_REGION, new Rect(0, 0, 0, 0)));
+        assertFalse(setUp.matches(CaptureRequest.SCALER_CROP_REGION, new Rect(0, 0, 1, 1)));
+    }
+
     @Test(expected=NullPointerException.class)
     public void requestSettingsSetNullArgToCreateRequest0() throws Exception {
         Camera2RequestSettingsSet setUp = new Camera2RequestSettingsSet();
-        setUp.createRequest(null, 0);
+        setUp.createRequest(null, CameraDevice.TEMPLATE_PREVIEW);
     }
 
     @Test(expected=NullPointerException.class)
     public void requestSettingsSetNullArgToCreateRequest2() throws Exception {
         Camera2RequestSettingsSet setUp = new Camera2RequestSettingsSet();
-        setUp.createRequest(mCamera, 0, (Surface) null);
+        setUp.createRequest(mCamera, CameraDevice.TEMPLATE_PREVIEW, (Surface) null);
     }
 
     @Test(expected=NullPointerException.class)
     public void requestSettingsSetNullArgToCreateRequest02() throws Exception {
         Camera2RequestSettingsSet setUp = new Camera2RequestSettingsSet();
-        setUp.createRequest(null, 0, (Surface) null);
+        setUp.createRequest(null, CameraDevice.TEMPLATE_PREVIEW, (Surface) null);
     }
 
     @Test