Refinements

pull/37/head
Mattia Iavarone 8 years ago
parent 3b458adfa2
commit e19f34687e
  1. 2
      .travis.yml
  2. 13
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java
  3. 5
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/OrientationHelperTest.java
  4. 2
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/PreviewTest.java
  5. 2
      codecov.yml

@ -15,7 +15,7 @@ jdk:
env: env:
global: global:
# Where to run androidTests # Where to run androidTests
- EMULATOR_API=22 # 24 has some issues - EMULATOR_API=22 # 24 has some issues, probably some overlayed window
- EMULATOR_ABI=armeabi-v7a - EMULATOR_ABI=armeabi-v7a
- EMULATOR_TAG=default - EMULATOR_TAG=default
- PATH=$ANDROID_HOME:$ANDROID_HOME/emulator:$ANDROID_HOME/platform-tools:$PATH - PATH=$ANDROID_HOME:$ANDROID_HOME/emulator:$ANDROID_HOME/platform-tools:$PATH

@ -1,6 +1,7 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview;
import android.annotation.SuppressLint;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@ -46,6 +47,7 @@ public class BaseTest {
// 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
@SuppressWarnings("MissingPermission")
public static void wakeUp() { public static void wakeUp() {
CameraLogger.setLogLevel(CameraLogger.LEVEL_VERBOSE); CameraLogger.setLogLevel(CameraLogger.LEVEL_VERBOSE);
@ -63,6 +65,7 @@ public class BaseTest {
} }
@AfterClass @AfterClass
@SuppressWarnings("MissingPermission")
public static void releaseWakeUp() { public static void releaseWakeUp() {
wakeLock.release(); wakeLock.release();
keyguardLock.reenableKeyguard(); keyguardLock.reenableKeyguard();
@ -89,10 +92,18 @@ public class BaseTest {
}); });
} }
public static void waitUi() { public static void idle() {
InstrumentationRegistry.getInstrumentation().waitForIdleSync(); InstrumentationRegistry.getInstrumentation().waitForIdleSync();
} }
public static void sleep(long time) {
try {
Thread.sleep(time);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
public static void grantPermissions() { public static void grantPermissions() {
grantPermission("android.permission.CAMERA"); grantPermission("android.permission.CAMERA");
grantPermission("android.permission.RECORD_AUDIO"); grantPermission("android.permission.RECORD_AUDIO");

@ -64,9 +64,10 @@ public class OrientationHelperTest extends BaseTest {
@Test @Test
public void testRotation() { public void testRotation() {
helper.enable(context());
reset(callbacks); // Reset counts. // Sometimes (on some APIs) the helper will trigger an update to 0
// right after enabling. But that's fine for us, times(1) will be OK either way.
helper.enable(context());
helper.mListener.onOrientationChanged(OrientationEventListener.ORIENTATION_UNKNOWN); helper.mListener.onOrientationChanged(OrientationEventListener.ORIENTATION_UNKNOWN);
assertEquals(helper.mLastOrientation, 0); assertEquals(helper.mLastOrientation, 0);
helper.mListener.onOrientationChanged(10); helper.mListener.onOrientationChanged(10);

@ -66,7 +66,7 @@ public abstract class PreviewTest extends BaseTest {
rule.getActivity().getContentView().removeView(preview.getView()); rule.getActivity().getContentView().removeView(preview.getView());
} }
}); });
waitUi(); idle();
} }
@After @After

@ -6,7 +6,7 @@ coverage:
status: status:
project: project:
default: default:
target: 65% target: 50%
patch: patch:
default: default:
target: 70% target: 70%

Loading…
Cancel
Save