pull/393/head
Mattia Iavarone 7 years ago
parent e09002946b
commit 65ba09cb4f
  1. 12
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java
  2. 2
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java
  3. 7
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java

@ -661,5 +661,17 @@ public class CameraViewTest extends BaseTest {
//endregion //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 // TODO: test permissions
} }

@ -89,7 +89,7 @@ public class IntegrationTest extends BaseTest {
} }
@After @After
public void tearDown() throws Exception { public void tearDown() {
camera.stopVideo(); camera.stopVideo();
camera.destroy(); camera.destroy();
WorkerHandler.destroy(); WorkerHandler.destroy();

@ -8,6 +8,7 @@ import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.annotation.WorkerThread; import androidx.annotation.WorkerThread;
import java.io.File; import java.io.File;
@ -53,8 +54,10 @@ abstract class CameraController implements
private SizeSelector mPictureSizeSelector; private SizeSelector mPictureSizeSelector;
private SizeSelector mVideoSizeSelector; private SizeSelector mVideoSizeSelector;
private int mSnapshotMaxWidth = Integer.MAX_VALUE; // in REF_VIEW for consistency with SizeSelectors @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
private int mSnapshotMaxHeight = Integer.MAX_VALUE; // in REF_VIEW for consistency with SizeSelectors 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 int mCameraId;
protected CameraOptions mCameraOptions; protected CameraOptions mCameraOptions;

Loading…
Cancel
Save