Merge "Fix test for a11y fingerprint with no sensor" into oc-dev am: 81150a53c8
am: 576b593034
Change-Id: Ibac40f343ff91c3898ebf362140b8aca07a6eaff
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFingerprintGestureTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFingerprintGestureTest.java
index 5e34c4b..3eebff9 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFingerprintGestureTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFingerprintGestureTest.java
@@ -29,9 +29,9 @@
import org.mockito.MockitoAnnotations;
import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
+
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
@@ -76,20 +76,9 @@
}
@Test
- public void testGetFingerprintManager_returnsManagerIfFeatureAvailable() {
- if (!mIsHardwareAvailable) {
- assertNull(mFingerprintGestureController);
- return;
- }
- assertNotNull(mFingerprintGestureController);
- }
-
- @Test
public void testGestureDetectionAvailable_initialState_shouldBeAvailable() {
- if (!mIsHardwareAvailable) {
- return;
- }
- assertTrue(mFingerprintGestureController.isGestureDetectionAvailable());
+ assertEquals(mIsHardwareAvailable,
+ mFingerprintGestureController.isGestureDetectionAvailable());
}
@Test
