Better tests

pull/172/head
Mattia Iavarone 8 years ago
parent 2657ff0e8e
commit 5ed61229c9
  1. 14
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java
  2. 23
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java
  3. 10
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/MockCameraController.java
  4. 10
      cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java
  5. 10
      cameraview/src/main/java/com/otaliastudios/cameraview/Camera2.java
  6. 21
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java
  7. 65
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java

@ -96,6 +96,8 @@ public class CameraViewTest extends BaseTest {
assertEquals(cameraView.getLocation(), null); assertEquals(cameraView.getLocation(), null);
assertEquals(cameraView.getExposureCorrection(), 0f, 0f); assertEquals(cameraView.getExposureCorrection(), 0f, 0f);
assertEquals(cameraView.getZoom(), 0f, 0f); assertEquals(cameraView.getZoom(), 0f, 0f);
assertEquals(cameraView.getVideoMaxDuration(), 0, 0);
assertEquals(cameraView.getVideoMaxSize(), 0, 0);
// Self managed // Self managed
assertEquals(cameraView.getPlaySounds(), CameraView.DEFAULT_PLAY_SOUNDS); assertEquals(cameraView.getPlaySounds(), CameraView.DEFAULT_PLAY_SOUNDS);
@ -567,6 +569,18 @@ public class CameraViewTest extends BaseTest {
assertEquals(result, source); assertEquals(result, source);
} }
@Test
public void testVideoMaxSize() {
cameraView.setVideoMaxSize(5000);
assertEquals(cameraView.getVideoMaxSize(), 5000);
}
@Test
public void testVideoMaxDuration() {
cameraView.setVideoMaxDuration(5000);
assertEquals(cameraView.getVideoMaxDuration(), 5000);
}
//endregion //endregion
//region Lists of listeners and processors //region Lists of listeners and processors

@ -5,6 +5,7 @@ import android.graphics.Bitmap;
import android.graphics.PointF; import android.graphics.PointF;
import android.hardware.Camera; import android.hardware.Camera;
import android.os.Build; import android.os.Build;
import android.os.Handler;
import android.support.test.filters.MediumTest; import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule; import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
@ -129,9 +130,9 @@ public class IntegrationTest extends BaseTest {
doEndTask(video, true).when(listener).onVideoTaken(any(File.class)); doEndTask(video, true).when(listener).onVideoTaken(any(File.class));
Boolean result = video.await(8000); Boolean result = video.await(8000);
if (expectSuccess) { if (expectSuccess) {
assertNotNull("Can take video", result); assertNotNull("Should end video", result);
} else { } else {
assertNull("Should not take video", result); assertNull("Should not end video", result);
} }
} }
@ -463,6 +464,24 @@ public class IntegrationTest extends BaseTest {
waitForVideoEnd(false); waitForVideoEnd(false);
} }
@Test
public void testEndVideo_withMaxSize() {
camera.setSessionType(SessionType.VIDEO);
camera.setVideoMaxSize(500*1000); // 0.5 mb
waitForOpen(true);
waitForVideoStart();
waitForVideoEnd(true);
}
@Test
public void testEndVideo_withMaxDuration() {
camera.setSessionType(SessionType.VIDEO);
camera.setVideoMaxDuration(4000);
waitForOpen(true);
waitForVideoStart();
waitForVideoEnd(true);
}
//endregion //endregion
//region startAutoFocus //region startAutoFocus

@ -125,16 +125,6 @@ public class MockCameraController extends CameraController {
public void onBufferAvailable(byte[] buffer) { public void onBufferAvailable(byte[] buffer) {
} }
@Override
void setVideoMaxSize(long videoMaxSizeInBytes) {
}
@Override
void setVideoMaxDuration(int videoMaxDurationMillis) {
}
@Override @Override
void setPlaySounds(boolean playSounds) { void setPlaySounds(boolean playSounds) {

@ -876,16 +876,6 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera
return result; return result;
} }
@Override
void setVideoMaxSize(long videoMaxSizeInBytes) {
mVideoMaxSize = videoMaxSizeInBytes;
}
@Override
void setVideoMaxDuration(int videoMaxDurationMillis) {
mVideoMaxDuration = videoMaxDurationMillis;
}
@Override @Override
void setPlaySounds(boolean playSounds) { void setPlaySounds(boolean playSounds) {
final boolean old = mPlaySounds; final boolean old = mPlaySounds;

@ -115,16 +115,6 @@ class Camera2 extends CameraController {
} }
@Override
void setVideoMaxSize(long videoMaxSizeInBytes) {
}
@Override
void setVideoMaxDuration(int videoMaxDurationMillis) {
}
@Override @Override
void setPlaySounds(boolean playSounds) { void setPlaySounds(boolean playSounds) {

@ -277,6 +277,15 @@ abstract class CameraController implements
mPictureSizeSelector = selector; mPictureSizeSelector = selector;
} }
final void setVideoMaxSize(long videoMaxSizeBytes) {
mVideoMaxSize = videoMaxSizeBytes;
}
final void setVideoMaxDuration(int videoMaxDurationMillis) {
mVideoMaxDuration = videoMaxDurationMillis;
}
//endregion //endregion
//region Abstract setters and APIs //region Abstract setters and APIs
@ -321,10 +330,6 @@ abstract class CameraController implements
abstract void startAutoFocus(@Nullable Gesture gesture, PointF point); abstract void startAutoFocus(@Nullable Gesture gesture, PointF point);
abstract void setVideoMaxSize(long videoMaxSizeInBytes);
abstract void setVideoMaxDuration(int videoMaxDurationMillis);
abstract void setPlaySounds(boolean playSounds); abstract void setPlaySounds(boolean playSounds);
//endregion //endregion
@ -357,6 +362,14 @@ abstract class CameraController implements
return mVideoQuality; return mVideoQuality;
} }
final long getVideoMaxSize() {
return mVideoMaxSize;
}
final int getVideoMaxDuration() {
return mVideoMaxDuration;
}
final SessionType getSessionType() { final SessionType getSessionType() {
return mSessionType; return mSessionType;
} }

@ -1208,8 +1208,7 @@ public class CameraView extends FrameLayout {
/** /**
* Starts recording a video with selected options, in a file called * Starts recording a video, in a file called "video.mp4" in the default folder.
* "video.mp4" in the default folder.
* This is discouraged, please use {@link #startCapturingVideo(File)} instead. * This is discouraged, please use {@link #startCapturingVideo(File)} instead.
* *
* @deprecated see {@link #startCapturingVideo(File)} * @deprecated see {@link #startCapturingVideo(File)}
@ -1221,7 +1220,7 @@ public class CameraView extends FrameLayout {
/** /**
* Starts recording a video with selected options. Video will be written to the given file, * Starts recording a video. Video will be written to the given file,
* so callers should ensure they have appropriate permissions to write to the file. * so callers should ensure they have appropriate permissions to write to the file.
* *
* @param file a file where the video will be saved * @param file a file where the video will be saved
@ -1242,29 +1241,29 @@ public class CameraView extends FrameLayout {
/** /**
* Starts recording a video with selected options. Video will be written to the given file, * Starts recording a video. Video will be written to the given file,
* so callers should ensure they have appropriate permissions to write to the file. * so callers should ensure they have appropriate permissions to write to the file.
* Recording will be automatically stopped after durationMillis, unless * Recording will be automatically stopped after the given duration, overriding
* {@link #stopCapturingVideo()} is not called meanwhile. * temporarily any duration limit set by {@link #setVideoMaxDuration(int)}.
* *
* @param file a file where the video will be saved * @param file a file where the video will be saved
* @param durationMillis video max duration * @param durationMillis recording max duration
* @throws IllegalArgumentException if durationMillis is less than 500 milliseconds
* *
* @deprecated This is not reliable. Please use {@link #setVideoMaxDuration(int)}. * @deprecated use {@link #setVideoMaxDuration(int)} instead.
*/ */
@Deprecated @Deprecated
public void startCapturingVideo(File file, long durationMillis) { public void startCapturingVideo(File file, long durationMillis) {
if (durationMillis < 500) { // TODO: v2: change signature to int, or remove (better).
throw new IllegalArgumentException("Video duration can't be < 500 milliseconds"); final int old = getVideoMaxDuration();
} addCameraListener(new CameraListener() {
startCapturingVideo(file);
mUiHandler.postDelayed(new Runnable() {
@Override @Override
public void run() { public void onVideoTaken(File video) {
stopCapturingVideo(); setVideoMaxDuration(old);
removeCameraListener(this);
} }
}, durationMillis); });
setVideoMaxDuration((int) durationMillis);
startCapturingVideo(file);
} }
@ -1341,9 +1340,6 @@ public class CameraView extends FrameLayout {
} }
} }
//endregion
//region Sounds
@SuppressLint("NewApi") @SuppressLint("NewApi")
private void playSound(int soundType) { private void playSound(int soundType) {
@ -1353,6 +1349,7 @@ public class CameraView extends FrameLayout {
} }
} }
/** /**
* Controls whether CameraView should play sound effects on certain * Controls whether CameraView should play sound effects on certain
* events (picture taken, focus complete). Note that: * events (picture taken, focus complete). Note that:
@ -1366,6 +1363,7 @@ public class CameraView extends FrameLayout {
mCameraController.setPlaySounds(playSounds); mCameraController.setPlaySounds(playSounds);
} }
/** /**
* Gets the current sound effect behavior. * Gets the current sound effect behavior.
* *
@ -1376,6 +1374,7 @@ public class CameraView extends FrameLayout {
return mPlaySounds; return mPlaySounds;
} }
/** /**
* Sets the maximum size in bytes for recorded video files. * Sets the maximum size in bytes for recorded video files.
* Once this size is reached, the recording will automatically stop. * Once this size is reached, the recording will automatically stop.
@ -1387,6 +1386,19 @@ public class CameraView extends FrameLayout {
mCameraController.setVideoMaxSize(videoMaxSizeInBytes); mCameraController.setVideoMaxSize(videoMaxSizeInBytes);
} }
/**
* Returns the maximum size in bytes for recorded video files, or 0
* if no size was set.
*
* @see #setVideoMaxSize(long)
* @return the maximum size in bytes
*/
public long getVideoMaxSize() {
return mCameraController.getVideoMaxSize();
}
/** /**
* Sets the maximum duration in milliseconds for video recordings. * Sets the maximum duration in milliseconds for video recordings.
* Once this duration is reached, the recording will automatically stop. * Once this duration is reached, the recording will automatically stop.
@ -1398,6 +1410,19 @@ public class CameraView extends FrameLayout {
mCameraController.setVideoMaxDuration(videoMaxDurationMillis); mCameraController.setVideoMaxDuration(videoMaxDurationMillis);
} }
/**
* Returns the maximum duration in milliseconds for video recordings, or 0
* if no limit was set.
*
* @see #setVideoMaxDuration(int)
* @return the maximum duration in milliseconds
*/
public int getVideoMaxDuration() {
return mCameraController.getVideoMaxDuration();
}
/** /**
* Returns true if the camera is currently recording a video * Returns true if the camera is currently recording a video
* @return boolean indicating if the camera is recording a video * @return boolean indicating if the camera is recording a video

Loading…
Cancel
Save