From 8fb766cb0da0122f94fbbeba309ba61a67ab3c55 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Sat, 7 Dec 2019 17:45:41 +0100 Subject: [PATCH] Test Camera1Integration --- .github/workflows/build.yml | 5 ++--- .../cameraview/engine/Camera1IntegrationTest.java | 2 +- .../otaliastudios/cameraview/markers/MarkerLayoutTest.java | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f70b35f5..3f3aff2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,9 +39,8 @@ jobs: strategy: matrix: # TODO 29 fails due to Mockito issues, probably reproducible locally. - # TODO 28 fails in MarkerLayoutTest.testOnEvent() - weird FrameLayout.onMeasure crash - # 22, 23, 24, 25, 26, 27, 28? - EMULATOR_API: [28] + # 22, 23, 24, 25, 26, 27, 28 work - some of them, with SdkExclude restrictions. + EMULATOR_API: [26] EMULATOR_ARCH: [x86_64] steps: - uses: actions/checkout@v1 diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/Camera1IntegrationTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/Camera1IntegrationTest.java index ee417387..eac5f1a6 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/Camera1IntegrationTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/Camera1IntegrationTest.java @@ -17,7 +17,7 @@ import androidx.test.filters.RequiresDevice; */ @RunWith(AndroidJUnit4.class) @LargeTest -@RequiresDevice +// @RequiresDevice public class Camera1IntegrationTest extends CameraIntegrationTest { @NonNull diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/markers/MarkerLayoutTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/markers/MarkerLayoutTest.java index 6632ea30..c203932f 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/markers/MarkerLayoutTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/markers/MarkerLayoutTest.java @@ -28,9 +28,9 @@ import static org.mockito.Mockito.verify; /** * Not clear why, but for some reason on API 28 the UiThreadTests here crash for an internal NPE - * in FrameLayout.onMeasure. Trying with uiSync. + * in FrameLayout.onMeasure. */ -// @SdkExclude(minSdkVersion = 28, maxSdkVersion = 28) +@SdkExclude(minSdkVersion = 28, maxSdkVersion = 28) @TargetApi(17) public class MarkerLayoutTest extends BaseTest {