From bd767bda8c18cc1f6290e9bc451ad3d2901d1e00 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Tue, 6 Aug 2019 18:54:29 +0200 Subject: [PATCH] Fix tests --- .../cameraview/engine/CameraIntegrationTest.java | 10 ++++++++-- .../cameraview/filter/FilterParser.java | 13 ++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java index b4a9bc85..a5b268c7 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java @@ -189,8 +189,14 @@ public abstract class CameraIntegrationTest extends BaseTest { // with video snapshots where we do lots of processing. The videoEnd callback can return // long after the actual stop() call, so if we're still processing, let's wait more. if (expectSuccess && camera.isTakingVideo()) { - return waitForVideoResult(true); - } else if (expectSuccess) { + while (camera.isTakingVideo()) { + video.listen(); + result = video.await(DELAY); + } + } + + // Now we should be OK. + if (expectSuccess) { assertEquals("Should call onVideoRecordingEnd", 0, onVideoRecordingEnd.getCount()); assertNotNull("Should end video", result); } else { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/FilterParser.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/FilterParser.java index d595c019..1f407acd 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/FilterParser.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/FilterParser.java @@ -16,13 +16,12 @@ public class FilterParser { public FilterParser(@NonNull TypedArray array) { String filterName = array.getString(R.styleable.CameraView_cameraFilter); - if (filterName != null) { - try { - Class filterClass = Class.forName(filterName); - filter = (Filter) filterClass.newInstance(); - } catch (Exception ignore) { - filter = new NoFilter(); - } + try { + //noinspection ConstantConditions + Class filterClass = Class.forName(filterName); + filter = (Filter) filterClass.newInstance(); + } catch (Exception ignore) { + filter = new NoFilter(); } }