Grant permissions, bump tests to N

pull/37/head
Mattia Iavarone 8 years ago
parent 9065e195fd
commit 0b0a941be6
  1. 4
      .travis.yml
  2. 12
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java
  3. 7
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java

@ -14,8 +14,8 @@ jdk:
env:
global:
# Run android tests on api level 22
- EMULATOR_API=22
# Where to run androidTests
- EMULATOR_API=24 # was 22
- EMULATOR_ABI=armeabi-v7a
- EMULATOR_TAG=default
- PATH=$ANDROID_HOME:$ANDROID_HOME/emulator:$ANDROID_HOME/platform-tools:$PATH

@ -5,6 +5,7 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Rect;
import android.graphics.YuvImage;
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.support.test.InstrumentationRegistry;
@ -56,6 +57,17 @@ public class BaseTest {
InstrumentationRegistry.getInstrumentation().waitForIdleSync();
}
public static void grantPermissions() {
grantPermission("android.permission.CAMERA");
grantPermission("android.permission.RECORD_AUDIO");
grantPermission("android.permission.WRITE_EXTERNAL_STORAGE");
}
public static void grantPermission(String permission) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
String command = "pm grant " + context().getPackageName() + " " + permission;
InstrumentationRegistry.getInstrumentation().getUiAutomation().executeShellCommand(command);
}
public static byte[] mockJpeg(int width, int height) {
Bitmap source = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);

@ -11,6 +11,7 @@ import android.view.ViewGroup;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -23,7 +24,6 @@ import static org.mockito.Mockito.*;
import static org.junit.Assert.*;
// TODO: won't work well in a 23+ emulator. Permissions will be asked.
@RunWith(AndroidJUnit4.class)
@MediumTest
public class IntegrationTest extends BaseTest {
@ -35,6 +35,11 @@ public class IntegrationTest extends BaseTest {
private Camera1 controller;
private CameraListener listener;
@BeforeClass
public static void grant() {
grantPermissions();
}
@Before
public void setUp() {
ui(new Runnable() {

Loading…
Cancel
Save