fix(location) Wire up trackerName (#2298)

Author: richardmcclellan

aws-android-sdk-location/src/main/java/com/amazonaws/mobileconnectors/geo/tracker/AWSLocationTracker.java

@@ -144,6 +144,7 @@ public synchronized void startTracking(
         this.trackingPublisher = new TrackingPublisher(
                 locationClient,
                 deviceId,
+                trackerName,
                 5,
                 options.getEmitLocationFrequency() == null ?
                         DEFAULT_EMIT_LOCATION_FREQUENCY :

aws-android-sdk-location/src/main/java/com/amazonaws/mobileconnectors/geo/tracker/TrackingPublisher.java

@@ -44,16 +44,19 @@ public class TrackingPublisher {
     private static final long TERMINATION_TIMEOUT_MS = 10;
 
     private final String deviceId;
+    private final String trackerName;
     private final LinkedBlockingQueue<DevicePositionUpdate> positionUpdateQueue;
     private final LinkedBlockingQueue<BatchUpdateDevicePositionRequest> batchRequestQueue;
     private final ScheduledFuture<?> scheduledFuture;
     private final ScheduledExecutorService scheduledExecutorService;
     private final BatchPublisher batchPublisher;
 
     public TrackingPublisher(AmazonLocationClient locationClient,
-                             String deviceId) {
+                             String deviceId,
+                             String trackerName) {
         this(locationClient,
              deviceId,
+             trackerName,
              DEFAULT_WORKER_POOL_SIZE,
              DEFAULT_PUBLISH_INTERVAL_MS,
              DEFAULT_BATCH_SIZE,
@@ -62,12 +65,14 @@ public TrackingPublisher(AmazonLocationClient locationClient,
 
     public TrackingPublisher(AmazonLocationClient locationClient,
                              String deviceId,
+                             String trackerName,
                              int workerPoolSize,
                              long publishIntervalMillis,
                              int batchSize,
                              TrackingListener listener) {
         this(locationClient,
              deviceId,
+             trackerName,
              Executors.newScheduledThreadPool(workerPoolSize),
              publishIntervalMillis,
              batchSize,
@@ -76,11 +81,13 @@ public TrackingPublisher(AmazonLocationClient locationClient,
 
     public TrackingPublisher(AmazonLocationClient locationClient,
                              String deviceId,
+                             String trackerName,
                              ScheduledExecutorService scheduledExecutorService,
                              long publishIntervalMillis,
                              int batchSize,
                              TrackingListener listener) {
         this.deviceId = deviceId;
+        this.trackerName = trackerName;
         positionUpdateQueue = new LinkedBlockingQueue<>(batchSize);
         batchRequestQueue = new LinkedBlockingQueue<>();
         batchPublisher = new BatchPublisher(locationClient, batchRequestQueue, listener);
@@ -185,7 +192,7 @@ private void flush(boolean force) {
      */
     private BatchUpdateDevicePositionRequest createNewBatch() {
         BatchUpdateDevicePositionRequest batch = new BatchUpdateDevicePositionRequest();
-        batch.setTrackerName(deviceId);
+        batch.setTrackerName(trackerName);
         batch.setUpdates(new ArrayList<DevicePositionUpdate>());
         return batch;
     }

aws-android-sdk-location/src/test/java/mobileconnectors/geo/tracker/TrackingPublisherTest.java

@@ -24,6 +24,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowLog;
 
@@ -45,6 +46,7 @@ public class TrackingPublisherTest {
     private static final long PUBLISH_INTERVAL_MS = TimeUnit.SECONDS.toMillis(2);
     private static final int BATCH_SIZE = 10;
     private static final long LATCH_WAIT_BASE_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(3);
+    private static final String TRACKER_NAME = "TRACKER_NAME";
 
     private TrackingPublisher trackingPublisher;
     private AmazonLocationClient mockLocationClient;
@@ -55,6 +57,7 @@ public void setup() {
         mockLocationClient = mock(AmazonLocationClient.class);
         trackingPublisher = new TrackingPublisher(mockLocationClient,
                                                   "UNIT_TEST_DEVICE_ID",
+                                                  TRACKER_NAME,
                                                   WORKER_POOL_SIZE,
                                                   PUBLISH_INTERVAL_MS,
                                                   BATCH_SIZE,
@@ -104,7 +107,14 @@ public void enqueueMoreThanBatchSizeTest() throws InterruptedException {
 
         latch.await(LATCH_WAIT_BASE_TIMEOUT_MS * expectedNumOfBatchesPublished, TimeUnit.SECONDS);
         // The client should have been called once.
-        verify(mockLocationClient, times(expectedNumOfBatchesPublished)).batchUpdateDevicePosition(any(BatchUpdateDevicePositionRequest.class));
+        ArgumentCaptor<BatchUpdateDevicePositionRequest> requestArgumentCaptor =
+                ArgumentCaptor.forClass(BatchUpdateDevicePositionRequest.class);
+        verify(mockLocationClient,
+                times(expectedNumOfBatchesPublished)).batchUpdateDevicePosition(requestArgumentCaptor.capture());
+
+        // Verify the tracker name was set to the expected value.
+        assertEquals(TRACKER_NAME, requestArgumentCaptor.getValue().getTrackerName());
+
         // No pending batches should be left.
         assertEquals(0, trackingPublisher.pendingBatches());
     }