From e38418ae6d7d5eb27504ff83272d998cb742cfcc Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Thu, 4 Jul 2019 11:01:49 -0500 Subject: [PATCH] Remove integration tests from CI --- cameraview/build.gradle | 5 +++++ .../cameraview/engine/CameraIntegration1Test.java | 4 ++-- .../cameraview/engine/CameraIntegration2Test.java | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cameraview/build.gradle b/cameraview/build.gradle index 9da69d03..13617d89 100644 --- a/cameraview/build.gradle +++ b/cameraview/build.gradle @@ -213,6 +213,11 @@ task mergedCoverageReport(type: JacocoReport) { '**/Dagger*Component$Builder.class', '**/*Module_*Factory.class', ] + if (travis) { + // Since this is not testable on the emulator... + classFilter.add('com.otaliastudios.cameraview.engine.Camera1Engine') + classFilter.add('com.otaliastudios.cameraview.engine.Camera2Engine') + } classDirectories = fileTree(dir: classDir, excludes: classFilter); reports.html.enabled = true diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegration1Test.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegration1Test.java index 9b667720..746e76e0 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegration1Test.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegration1Test.java @@ -14,11 +14,11 @@ import androidx.test.filters.LargeTest; * These tests work great on real devices, and are the only way to test actual CameraEngine * implementation - we really need to open the camera device. * Unfortunately they fail unreliably on emulated devices, due to some bug with the - * emulated camera controller. Waiting for it to be fixed. + * emulated camera controller. */ @RunWith(AndroidJUnit4.class) @LargeTest -@Ignore +@Ignore("These do work but fail on CI emulators, due to bugs in the Camera1 emulated devices.") public class CameraIntegration1Test extends CameraIntegrationTest { @NonNull diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegration2Test.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegration2Test.java index 74c5432b..b67bb84d 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegration2Test.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegration2Test.java @@ -9,8 +9,15 @@ import androidx.annotation.NonNull; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; +/** + * These tests work great on real devices, and are the only way to test actual CameraEngine + * implementation - we really need to open the camera device. + * Unfortunately they fail unreliably on emulated devices, due to some bug with the + * emulated camera controller. + */ @RunWith(AndroidJUnit4.class) @LargeTest +@Ignore("These do work but fail on CI emulators.") public class CameraIntegration2Test extends CameraIntegrationTest { @NonNull