pull/484/head
Mattia Iavarone 6 years ago
parent 4c40d51485
commit 2e5eec401d
  1. 5
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java
  2. 4
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewCallbacksTest.java
  3. 14
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java

@ -216,9 +216,8 @@ public class CameraOptions1Test extends BaseTest {
when(params.getMinExposureCompensation()).thenReturn(0); when(params.getMinExposureCompensation()).thenReturn(0);
CameraOptions o = new CameraOptions(params, false); CameraOptions o = new CameraOptions(params, false);
assertFalse(o.supports(GestureAction.FOCUS)); assertFalse(o.supports(GestureAction.AUTO_FOCUS));
assertFalse(o.supports(GestureAction.FOCUS_WITH_MARKER)); assertTrue(o.supports(GestureAction.TAKE_PICTURE));
assertTrue(o.supports(GestureAction.CAPTURE));
assertTrue(o.supports(GestureAction.NONE)); assertTrue(o.supports(GestureAction.NONE));
assertTrue(o.supports(GestureAction.ZOOM)); assertTrue(o.supports(GestureAction.ZOOM));
assertFalse(o.supports(GestureAction.EXPOSURE_CORRECTION)); assertFalse(o.supports(GestureAction.EXPOSURE_CORRECTION));

@ -189,7 +189,7 @@ public class CameraViewCallbacksTest extends BaseTest {
public void testDispatchOnFocusStart() { public void testDispatchOnFocusStart() {
// Enable tap gesture. // Enable tap gesture.
// Can't mock package protected. camera.mTapGestureLayout = mock(TapGestureLayout.class); // 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(); PointF point = new PointF();
completeTask().when(listener).onAutoFocusStart(point); completeTask().when(listener).onAutoFocusStart(point);
@ -204,7 +204,7 @@ public class CameraViewCallbacksTest extends BaseTest {
public void testDispatchOnFocusEnd() { public void testDispatchOnFocusEnd() {
// Enable tap gesture. // Enable tap gesture.
// Can't mock package protected. camera.mTapGestureLayout = mock(TapGestureLayout.class); // 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(); PointF point = new PointF();
boolean success = true; boolean success = true;

@ -173,7 +173,7 @@ public class CameraViewTest extends BaseTest {
assertEquals(cameraView.getGestureAction(Gesture.PINCH), GestureAction.ZOOM); assertEquals(cameraView.getGestureAction(Gesture.PINCH), GestureAction.ZOOM);
// Not assignable: This is like clearing // 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); assertEquals(cameraView.getGestureAction(Gesture.PINCH), GestureAction.NONE);
// Test clearing // Test clearing
@ -197,7 +197,7 @@ public class CameraViewTest extends BaseTest {
assertFalse(cameraView.mPinchGestureLayout.isActive()); assertFalse(cameraView.mPinchGestureLayout.isActive());
// TapGestureLayout // TapGestureLayout
cameraView.mapGesture(Gesture.TAP, GestureAction.CAPTURE); cameraView.mapGesture(Gesture.TAP, GestureAction.TAKE_PICTURE);
assertTrue(cameraView.mTapGestureLayout.isActive()); assertTrue(cameraView.mTapGestureLayout.isActive());
cameraView.clearGesture(Gesture.TAP); cameraView.clearGesture(Gesture.TAP);
assertFalse(cameraView.mPinchGestureLayout.isActive()); 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); cameraView.dispatchTouchEvent(event);
assertTrue(mockController.mPictureCaptured); assertTrue(mockController.mPictureCaptured);
} }
@ -253,13 +253,7 @@ public class CameraViewTest extends BaseTest {
} }
}); });
mockController.mFocusStarted = false; mockController.mFocusStarted = false;
cameraView.mapGesture(Gesture.TAP, GestureAction.FOCUS); cameraView.mapGesture(Gesture.TAP, GestureAction.AUTO_FOCUS);
cameraView.dispatchTouchEvent(event);
assertTrue(mockController.mFocusStarted);
// Try with FOCUS_WITH_MARKER
mockController.mFocusStarted = false;
cameraView.mapGesture(Gesture.TAP, GestureAction.FOCUS_WITH_MARKER);
cameraView.dispatchTouchEvent(event); cameraView.dispatchTouchEvent(event);
assertTrue(mockController.mFocusStarted); assertTrue(mockController.mFocusStarted);
} }

Loading…
Cancel
Save