Merge "Add a CTS test for when location is already within geofence." into jb-mr1-dev

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/tests/location/src/android/location/cts/LocationManagerTest.java b/tests/tests/location/src/android/location/cts/LocationManagerTest.java
index 267d8b1a062..edfda5a54b3 100755
--- a/tests/tests/location/src/android/location/cts/LocationManagerTest.java
+++ b/tests/tests/location/src/android/location/cts/LocationManagerTest.java
@@ -631,6 +631,21 @@ public class LocationManagerTest extends InstrumentationTestCase {
     }
 
     /**
+     * Tests basic proximity alert when initially within proximity
+     */
+    public void testInitiallyWithinProximity() throws Exception {
+        // need to mock the fused location provider for proximity tests
+        mockFusedLocation();
+
+        updateLocationAndWait(FUSED_PROVIDER_NAME, 0, 0);
+        registerProximityListener(0, 0, 1000, 10000);
+        waitForReceiveBroadcast();
+        assertProximityType(true);
+
+        unmockFusedLocation();
+    }
+
+    /**
      * Helper variant for testing enter proximity scenario
      * TODO: add additional parameters as more scenarios are added
      *