Add wake lock permission

pull/37/head
Mattia Iavarone 8 years ago
parent 50111aadf0
commit 2b54adbc13
  1. 1
      cameraview/src/androidTest/AndroidManifest.xml
  2. 4
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java
  3. 8
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraCallbacksTest.java

@ -4,6 +4,7 @@
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/> <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<application> <application>

@ -39,12 +39,16 @@ import static org.mockito.Mockito.when;
public class BaseTest { public class BaseTest {
public static CameraLogger LOG = CameraLogger.create("Test");
private static KeyguardManager.KeyguardLock keyguardLock; private static KeyguardManager.KeyguardLock keyguardLock;
private static PowerManager.WakeLock wakeLock; 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 // https://github.com/linkedin/test-butler/blob/bc2bb4df13d0a554d2e2b0ea710795017717e710/test-butler-app/src/main/java/com/linkedin/android/testbutler/ButlerService.java#L121
@BeforeClass @BeforeClass
public static void wakeUp() { public static void wakeUp() {
CameraLogger.setLogLevel(CameraLogger.LEVEL_VERBOSE);
// Acquire a keyguard lock to prevent the lock screen from randomly appearing and breaking tests // Acquire a keyguard lock to prevent the lock screen from randomly appearing and breaking tests
KeyguardManager keyguardManager = (KeyguardManager) context().getSystemService(KEYGUARD_SERVICE); KeyguardManager keyguardManager = (KeyguardManager) context().getSystemService(KEYGUARD_SERVICE);
keyguardLock = keyguardManager.newKeyguardLock("CameraViewLock"); keyguardLock = keyguardManager.newKeyguardLock("CameraViewLock");

@ -237,11 +237,13 @@ public class CameraCallbacksTest extends BaseTest {
// With crop flag: expect a 1:1 ratio. // With crop flag: expect a 1:1 ratio.
int[] output = testProcessImage(true, true, viewDim, imageDim); int[] output = testProcessImage(true, true, viewDim, imageDim);
LOG.i("testProcessJpeg", output);
assertEquals(output[0], 1000); assertEquals(output[0], 1000);
assertEquals(output[1], 1000); assertEquals(output[1], 1000);
// Without crop flag: expect original ratio. // Without crop flag: expect original ratio.
output = testProcessImage(true, false, viewDim, imageDim); output = testProcessImage(true, false, viewDim, imageDim);
LOG.i("testProcessJpeg", output);
assertEquals(output[0], imageDim[0]); assertEquals(output[0], imageDim[0]);
assertEquals(output[1], imageDim[1]); assertEquals(output[1], imageDim[1]);
} }
@ -253,11 +255,13 @@ public class CameraCallbacksTest extends BaseTest {
// With crop flag: expect a 1:1 ratio. // With crop flag: expect a 1:1 ratio.
int[] output = testProcessImage(false, true, viewDim, imageDim); int[] output = testProcessImage(false, true, viewDim, imageDim);
LOG.i("testProcessYuv", output);
assertEquals(output[0], 1000); assertEquals(output[0], 1000);
assertEquals(output[1], 1000); assertEquals(output[1], 1000);
// Without crop flag: expect original ratio. // Without crop flag: expect original ratio.
output = testProcessImage(false, false, viewDim, imageDim); output = testProcessImage(false, false, viewDim, imageDim);
LOG.i("testProcessYuv", output);
assertEquals(output[0], imageDim[0]); assertEquals(output[0], imageDim[0]);
assertEquals(output[1], imageDim[1]); assertEquals(output[1], imageDim[1]);
} }
@ -292,8 +296,8 @@ public class CameraCallbacksTest extends BaseTest {
} }
// Wait for result and get out dimensions. // Wait for result and get out dimensions.
byte[] result = jpegTask.await(800); byte[] result = jpegTask.await(3000);
assertNotNull(result); assertNotNull("Image was processed", result);
Bitmap bitmap = BitmapFactory.decodeByteArray(result, 0, result.length); Bitmap bitmap = BitmapFactory.decodeByteArray(result, 0, result.length);
return new int[]{ bitmap.getWidth(), bitmap.getHeight() }; return new int[]{ bitmap.getWidth(), bitmap.getHeight() };
} }

Loading…
Cancel
Save