Merge pull request #248 from tommythorsen/master

Add myself to the CONTRIBUTORS file and fix a few issues.
google · Jun 28, 2015 · a41a1cd · a41a1cd
2 parents 3cd7a15 + be65978
commit a41a1cd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -15,3 +15,4 @@ collinmast
 corymast
 bobkressin
 harshadsabne
+tommythorsen
diff --git a/android-uribeacon/blescan/build.gradle b/android-uribeacon/blescan/build.gradle
@@ -24,9 +24,6 @@ android {
     sourceSets {
         main {
             manifest.srcFile 'src/androidTest/AndroidManifest.xml'
-            java {
-                srcDirs = ['src/main/java/org/uribeacon/scan']
-            }
         }
     }
 }
@@ -46,4 +43,5 @@ makeJar.dependsOn(clearJar, build)
 
 dependencies {
     compile 'com.android.support:support-v4:21.0.3'
+    androidTestCompile 'org.mockito:mockito-core:2.0.5-beta'
 }
diff --git a/.../src/androidTest/java/org/uribeacon/scan/compat/BluetoothLeScannerCompatProviderTest.java b/.../src/androidTest/java/org/uribeacon/scan/compat/BluetoothLeScannerCompatProviderTest.java
@@ -24,6 +24,7 @@
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
 import android.content.ContextWrapper;
+import android.os.Build;
 import android.test.AndroidTestCase;
 
 import org.uribeacon.scan.compat.BluetoothLeScannerCompat;
@@ -97,10 +98,14 @@ public void testManagersRequired() {
     assertNull(BluetoothLeScannerCompatProvider.getBluetoothLeScannerCompat(
         context, canUseNativeApi));
 
-    bluetoothManager = (BluetoothManager) getContext().getSystemService(BLUETOOTH_SERVICE);
-    alarmManager = null;
-    assertNull(BluetoothLeScannerCompatProvider.getBluetoothLeScannerCompat(
-        context, canUseNativeApi));
+    // The alarm manager is not mandatory for creating a bluetooth scanner on
+    // LOLLIPOP (at least not if the right hardware features are supported.)
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+      bluetoothManager = (BluetoothManager) getContext().getSystemService(BLUETOOTH_SERVICE);
+      alarmManager = null;
+      assertNull(BluetoothLeScannerCompatProvider.getBluetoothLeScannerCompat(
+          context, canUseNativeApi));
+    }
 
     bluetoothManager = null;
     alarmManager = (AlarmManager) getContext().getSystemService(ALARM_SERVICE);