diff --git a/cameraview/src/androidTest/AndroidManifest.xml b/cameraview/src/androidTest/AndroidManifest.xml index 3dd00dbc..431ee7a8 100644 --- a/cameraview/src/androidTest/AndroidManifest.xml +++ b/cameraview/src/androidTest/AndroidManifest.xml @@ -4,6 +4,7 @@ + diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java index 18471b9f..1be2a610 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java @@ -39,12 +39,16 @@ import static org.mockito.Mockito.when; public class BaseTest { + public static CameraLogger LOG = CameraLogger.create("Test"); + private static KeyguardManager.KeyguardLock keyguardLock; private static PowerManager.WakeLock wakeLock; // https://github.com/linkedin/test-butler/blob/bc2bb4df13d0a554d2e2b0ea710795017717e710/test-butler-app/src/main/java/com/linkedin/android/testbutler/ButlerService.java#L121 @BeforeClass public static void wakeUp() { + CameraLogger.setLogLevel(CameraLogger.LEVEL_VERBOSE); + // Acquire a keyguard lock to prevent the lock screen from randomly appearing and breaking tests KeyguardManager keyguardManager = (KeyguardManager) context().getSystemService(KEYGUARD_SERVICE); keyguardLock = keyguardManager.newKeyguardLock("CameraViewLock"); diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraCallbacksTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraCallbacksTest.java index 8c59cbd9..16b10405 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraCallbacksTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraCallbacksTest.java @@ -237,11 +237,13 @@ public class CameraCallbacksTest extends BaseTest { // With crop flag: expect a 1:1 ratio. int[] output = testProcessImage(true, true, viewDim, imageDim); + LOG.i("testProcessJpeg", output); assertEquals(output[0], 1000); assertEquals(output[1], 1000); // Without crop flag: expect original ratio. output = testProcessImage(true, false, viewDim, imageDim); + LOG.i("testProcessJpeg", output); assertEquals(output[0], imageDim[0]); assertEquals(output[1], imageDim[1]); } @@ -253,11 +255,13 @@ public class CameraCallbacksTest extends BaseTest { // With crop flag: expect a 1:1 ratio. int[] output = testProcessImage(false, true, viewDim, imageDim); + LOG.i("testProcessYuv", output); assertEquals(output[0], 1000); assertEquals(output[1], 1000); // Without crop flag: expect original ratio. output = testProcessImage(false, false, viewDim, imageDim); + LOG.i("testProcessYuv", output); assertEquals(output[0], imageDim[0]); assertEquals(output[1], imageDim[1]); } @@ -292,8 +296,8 @@ public class CameraCallbacksTest extends BaseTest { } // Wait for result and get out dimensions. - byte[] result = jpegTask.await(800); - assertNotNull(result); + byte[] result = jpegTask.await(3000); + assertNotNull("Image was processed", result); Bitmap bitmap = BitmapFactory.decodeByteArray(result, 0, result.length); return new int[]{ bitmap.getWidth(), bitmap.getHeight() }; }