From 2e5eec401d0019569972c6121a8134bd2b822345 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Mon, 24 Jun 2019 12:26:39 -0500 Subject: [PATCH] Fix tests --- .../cameraview/CameraOptions1Test.java | 5 ++--- .../cameraview/CameraViewCallbacksTest.java | 4 ++-- .../otaliastudios/cameraview/CameraViewTest.java | 14 ++++---------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java index f40b8a0b..9d13e999 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java @@ -216,9 +216,8 @@ public class CameraOptions1Test extends BaseTest { when(params.getMinExposureCompensation()).thenReturn(0); CameraOptions o = new CameraOptions(params, false); - assertFalse(o.supports(GestureAction.FOCUS)); - assertFalse(o.supports(GestureAction.FOCUS_WITH_MARKER)); - assertTrue(o.supports(GestureAction.CAPTURE)); + assertFalse(o.supports(GestureAction.AUTO_FOCUS)); + assertTrue(o.supports(GestureAction.TAKE_PICTURE)); assertTrue(o.supports(GestureAction.NONE)); assertTrue(o.supports(GestureAction.ZOOM)); assertFalse(o.supports(GestureAction.EXPOSURE_CORRECTION)); diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewCallbacksTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewCallbacksTest.java index c816f113..7f4333f8 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewCallbacksTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewCallbacksTest.java @@ -189,7 +189,7 @@ public class CameraViewCallbacksTest extends BaseTest { public void testDispatchOnFocusStart() { // Enable tap gesture. // Can't mock package protected. camera.mTapGestureLayout = mock(TapGestureLayout.class); - camera.mapGesture(Gesture.TAP, GestureAction.FOCUS_WITH_MARKER); + camera.mapGesture(Gesture.TAP, GestureAction.AUTO_FOCUS); PointF point = new PointF(); completeTask().when(listener).onAutoFocusStart(point); @@ -204,7 +204,7 @@ public class CameraViewCallbacksTest extends BaseTest { public void testDispatchOnFocusEnd() { // Enable tap gesture. // Can't mock package protected. camera.mTapGestureLayout = mock(TapGestureLayout.class); - camera.mapGesture(Gesture.TAP, GestureAction.FOCUS_WITH_MARKER); + camera.mapGesture(Gesture.TAP, GestureAction.AUTO_FOCUS); PointF point = new PointF(); boolean success = true; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java index dc247caf..98bffc05 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java @@ -173,7 +173,7 @@ public class CameraViewTest extends BaseTest { assertEquals(cameraView.getGestureAction(Gesture.PINCH), GestureAction.ZOOM); // Not assignable: This is like clearing - cameraView.mapGesture(Gesture.PINCH, GestureAction.CAPTURE); + cameraView.mapGesture(Gesture.PINCH, GestureAction.TAKE_PICTURE); assertEquals(cameraView.getGestureAction(Gesture.PINCH), GestureAction.NONE); // Test clearing @@ -197,7 +197,7 @@ public class CameraViewTest extends BaseTest { assertFalse(cameraView.mPinchGestureLayout.isActive()); // TapGestureLayout - cameraView.mapGesture(Gesture.TAP, GestureAction.CAPTURE); + cameraView.mapGesture(Gesture.TAP, GestureAction.TAKE_PICTURE); assertTrue(cameraView.mTapGestureLayout.isActive()); cameraView.clearGesture(Gesture.TAP); assertFalse(cameraView.mPinchGestureLayout.isActive()); @@ -230,7 +230,7 @@ public class CameraViewTest extends BaseTest { }; } }); - cameraView.mapGesture(Gesture.TAP, GestureAction.CAPTURE); + cameraView.mapGesture(Gesture.TAP, GestureAction.TAKE_PICTURE); cameraView.dispatchTouchEvent(event); assertTrue(mockController.mPictureCaptured); } @@ -253,13 +253,7 @@ public class CameraViewTest extends BaseTest { } }); mockController.mFocusStarted = false; - cameraView.mapGesture(Gesture.TAP, GestureAction.FOCUS); - cameraView.dispatchTouchEvent(event); - assertTrue(mockController.mFocusStarted); - - // Try with FOCUS_WITH_MARKER - mockController.mFocusStarted = false; - cameraView.mapGesture(Gesture.TAP, GestureAction.FOCUS_WITH_MARKER); + cameraView.mapGesture(Gesture.TAP, GestureAction.AUTO_FOCUS); cameraView.dispatchTouchEvent(event); assertTrue(mockController.mFocusStarted); }