From 65ba09cb4f8a4d9b73f59977ea51c31e82373a04 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Sun, 24 Feb 2019 20:23:49 +0100 Subject: [PATCH] Add tests --- .../com/otaliastudios/cameraview/CameraViewTest.java | 12 ++++++++++++ .../otaliastudios/cameraview/IntegrationTest.java | 2 +- .../otaliastudios/cameraview/CameraController.java | 7 +++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java index d26d666a..04a42fad 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java @@ -661,5 +661,17 @@ public class CameraViewTest extends BaseTest { //endregion + //region Snapshots + + @Test + public void testSetSnapshotMaxSize() { + cameraView.setSnapshotMaxWidth(500); + cameraView.setSnapshotMaxHeight(1000); + assertEquals(mockController.mSnapshotMaxWidth, 500); + assertEquals(mockController.mSnapshotMaxHeight, 1000); + } + + //endregion + // TODO: test permissions } diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java index 98760646..d7d47eb4 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java @@ -89,7 +89,7 @@ public class IntegrationTest extends BaseTest { } @After - public void tearDown() throws Exception { + public void tearDown() { camera.stopVideo(); camera.destroy(); WorkerHandler.destroy(); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java index 57af58b1..4b28bb31 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java @@ -8,6 +8,7 @@ import android.os.Handler; import android.os.Looper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import androidx.annotation.WorkerThread; import java.io.File; @@ -53,8 +54,10 @@ abstract class CameraController implements private SizeSelector mPictureSizeSelector; private SizeSelector mVideoSizeSelector; - private int mSnapshotMaxWidth = Integer.MAX_VALUE; // in REF_VIEW for consistency with SizeSelectors - private int mSnapshotMaxHeight = Integer.MAX_VALUE; // in REF_VIEW for consistency with SizeSelectors + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + int mSnapshotMaxWidth = Integer.MAX_VALUE; // in REF_VIEW for consistency with SizeSelectors + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + int mSnapshotMaxHeight = Integer.MAX_VALUE; // in REF_VIEW for consistency with SizeSelectors protected int mCameraId; protected CameraOptions mCameraOptions;