Merge with head.

MyTracksTest/src/com/google/android/apps/mytracks/DialogManagerTest.java

@@ -1,72 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.android.apps.mytracks;
-
-import com.google.android.apps.mytracks.io.sendtogoogle.SendDialog;
-
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * @author Sandor Dornbush
- */
-public class DialogManagerTest
-    extends ActivityInstrumentationTestCase2<MyTracks> {
-
-  public DialogManagerTest() {
-    super(MyTracks.class);
-  }
-
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-    MyTracks.clearInstance();
-    assertNull(MyTracks.getInstance());
-  }
-
-  public void test_onCreateChartSettings() {
-    Dialog d =
-        getActivity().onCreateDialog(DialogManager.DIALOG_CHART_SETTINGS, null);
-    assertNotNull(d);
-    assertTrue(d instanceof ChartSettingsDialog);
-  }
-
-  public void test_onCreateImportProgress() {
-    Dialog d =
-        getActivity().onCreateDialog(
-            DialogManager.DIALOG_IMPORT_PROGRESS, null);
-    assertNotNull(d);
-    assertTrue(d instanceof ProgressDialog);
-  }
-
-  public void test_onCreateProgress() {
-    Dialog d =
-        getActivity().onCreateDialog(DialogManager.DIALOG_PROGRESS, null);
-    assertNotNull(d);
-    assertTrue(d instanceof ProgressDialog);
-    ProgressDialog pd = (ProgressDialog) d;
-    assertEquals(100, pd.getMax());
-    assertEquals(10, pd.getProgress());
-  }
-
-  public void test_onCreateSendToGoogle() {
-    Dialog d =
-        getActivity().onCreateDialog(DialogManager.DIALOG_SEND_TO_GOOGLE, null);
-    assertNotNull(d);
-    assertTrue(d instanceof SendDialog);
-  }
-}

MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java

@@ -1,12 +1,12 @@
 /*
  * Copyright 2010 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,6 +15,8 @@
  */
 package com.google.android.apps.mytracks;
 
+import com.google.android.apps.mytracks.services.ServiceUtils;
+import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -32,60 +34,53 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * A unit test for {@link MyTracks} activity.
- * 
+ *
  * @author Bartlomiej Niechwiej
  */
 public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
+  private SharedPreferences sharedPreferences;
+  private TrackRecordingServiceConnection serviceConnection;
+
   public MyTracksTest() {
     super(MyTracks.class);
   }
 
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-    MyTracks.clearInstance();
-    assertNull(MyTracks.getInstance());
-  }
-
   @Override
   protected void tearDown() throws Exception {
     clearSelectedAndRecordingTracks();
     waitForIdle();
+
     super.tearDown();
   }
-  
+
   public void testInitialization_mainAction() {
     // Make sure we can start MyTracks and the activity doesn't start recording.
-    assertNotNull(getActivity());
-    assertNotNull(MyTracks.getInstance());
-    assertNotNull(getActivity().getSharedPreferences());
-    
+    assertInitialized();
+
     // Check if not recording.
-    assertFalse(getActivity().isRecording());
-    assertEquals(-1, getActivity().getRecordingTrackId());
-    long selectedTrackId = getActivity().getSharedPreferences().getLong(
+    assertFalse(isRecording());
+    assertEquals(-1, getRecordingTrackId());
+    long selectedTrackId = getSharedPreferences().getLong(
         getActivity().getString(R.string.selected_track_key), -1);
     assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
   }
-  
+
   public void testInitialization_viewActionWithNoData() {
     // Simulate start with ACTION_VIEW intent.
     Intent startIntent = new Intent();
     startIntent.setAction(Intent.ACTION_VIEW);
     setActivityIntent(startIntent);
-    
-    assertNotNull(getActivity());
-    assertNotNull(MyTracks.getInstance());
-    assertNotNull(getActivity().getSharedPreferences());
-    
+
+    assertInitialized();
+
     // Check if not recording.
-    assertFalse(getActivity().isRecording());
-    assertEquals(-1, getActivity().getRecordingTrackId());
-    long selectedTrackId = getActivity().getSharedPreferences().getLong(
+    assertFalse(isRecording());
+    assertEquals(-1, getRecordingTrackId());
+    long selectedTrackId = getSharedPreferences().getLong(
         getActivity().getString(R.string.selected_track_key), -1);
     assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
   }
-  
+
   public void testInitialization_viewActionWithValidData() throws Exception {
     // Simulate start with ACTION_VIEW intent.
     Intent startIntent = new Intent();
@@ -93,24 +88,22 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
     Uri uri = Uri.fromFile(File.createTempFile("valid", ".gpx"));
 
     // TODO: Add a valid GPX.
-    
+
     startIntent.setData(uri);
     setActivityIntent(startIntent);
-    
-    assertNotNull(getActivity());
-    assertNotNull(MyTracks.getInstance());
-    assertNotNull(getActivity().getSharedPreferences());
-    
+
+    assertInitialized();
+
     // Check if not recording.
-    assertFalse(getActivity().isRecording());
-    assertEquals(-1, getActivity().getRecordingTrackId());
-    long selectedTrackId = getActivity().getSharedPreferences().getLong(
+    assertFalse(isRecording());
+    assertEquals(-1, getRecordingTrackId());
+    long selectedTrackId = getSharedPreferences().getLong(
         getActivity().getString(R.string.selected_track_key), -1);
     assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
-    
-   // TODO: Finish this test.
+
+    // TODO: Finish this test.
   }
-  
+
   public void testInitialization_viewActionWithInvalidData() throws Exception {
     // Simulate start with ACTION_VIEW intent.
     Intent startIntent = new Intent();
@@ -118,66 +111,62 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
     Uri uri = Uri.fromFile(File.createTempFile("invalid", ".gpx"));
     startIntent.setData(uri);
     setActivityIntent(startIntent);
-    
-    assertNotNull(getActivity());
-    assertNotNull(MyTracks.getInstance());
-    assertNotNull(getActivity().getSharedPreferences());
-    
+
+    assertInitialized();
+
     // Check if not recording.
-    assertFalse(getActivity().isRecording());
-    assertEquals(-1, getActivity().getRecordingTrackId());
-    long selectedTrackId = getActivity().getSharedPreferences().getLong(
+    assertFalse(isRecording());
+    assertEquals(-1, getRecordingTrackId());
+    long selectedTrackId = getSharedPreferences().getLong(
         getActivity().getString(R.string.selected_track_key), -1);
     assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
-    
+
     // TODO: Finish this test.
   }
-  
+
   public void testRecording_startAndStop() throws Exception {
-    // Make sure we can start MyTracks and the activity doesn't start recording.
-    assertNotNull(getActivity());
-    assertNotNull(MyTracks.getInstance());
-    assertNotNull(getActivity().getSharedPreferences());
+    assertInitialized();
 
     // Check if not recording.
-    clearSelectedAndRecordingTracks();    
+    clearSelectedAndRecordingTracks();
     waitForIdle();
 
-    assertFalse(getActivity().isRecording());
-    assertEquals(-1, getActivity().getRecordingTrackId());
-    long selectedTrackId = getActivity().getSharedPreferences().getLong(
+    assertFalse(isRecording());
+    assertEquals(-1, getRecordingTrackId());
+    long selectedTrackId = getSharedPreferences().getLong(
         getActivity().getString(R.string.selected_track_key), -1);
     assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
 
     // Start a new track.
     getActivity().startRecording();
+    serviceConnection.bindIfRunning();
     long recordingTrackId = awaitRecordingStatus(5000, true);
     assertTrue(recordingTrackId >= 0);
-    
+
     // Wait until we are done and make sure that selectedTrack = recordingTrack.
     waitForIdle();
-    assertEquals(recordingTrackId, getActivity().getSharedPreferences().getLong(
+    assertEquals(recordingTrackId, getSharedPreferences().getLong(
         getActivity().getString(R.string.recording_track_key), -1));
-    selectedTrackId = getActivity().getSharedPreferences().getLong(
+    selectedTrackId = getSharedPreferences().getLong(
         getActivity().getString(R.string.selected_track_key), -1);
     assertEquals(recordingTrackId, selectedTrackId);
     assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
-    
-    // Watch for MyTracksDetails activity. 
+
+    // Watch for MyTracksDetails activity.
     ActivityMonitor monitor = getInstrumentation().addMonitor(
         TrackDetails.class.getName(), null, false);
 
     // Now, stop the track and make sure that it is still selected, but
     // no longer recording.
     getActivity().stopRecording();
-    
-    // Check if we got back MyTracksDetails activity. 
+
+    // Check if we got back MyTracksDetails activity.
     Activity activity = getInstrumentation().waitForMonitor(monitor);
     assertTrue(activity instanceof TrackDetails);
-    
+
     // TODO: Update track name and other properties and test if they were
     // properly saved.
-    
+
     // Simulate a click on Save button.
     Button save = (Button) activity.findViewById(R.id.trackdetails_save);
     save.performClick();
@@ -185,18 +174,24 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
     // Check the remaining properties.
     recordingTrackId = awaitRecordingStatus(5000, false);
     assertEquals(-1, recordingTrackId);
-    assertEquals(recordingTrackId, getActivity().getRecordingTrackId());
-    assertEquals(recordingTrackId, getActivity().getSharedPreferences().getLong(
+    assertEquals(recordingTrackId, getRecordingTrackId());
+    assertEquals(recordingTrackId, getSharedPreferences().getLong(
         getActivity().getString(R.string.recording_track_key), -1));
     // Make sure this is the same track as the last recording track ID.
     assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
   }
-  
+
+  private void assertInitialized() {
+    assertNotNull(getActivity());
+
+    serviceConnection = new TrackRecordingServiceConnection(getActivity(), null);
+  }
+
   /**
    * Waits until the UI thread becomes idle.
    */
   private void waitForIdle() throws InterruptedException {
-    // Note: We can't use getInstrumentation().waitForIdleSync() here.  
+    // Note: We can't use getInstrumentation().waitForIdleSync() here.
     final Object semaphore = new Object();
     synchronized (semaphore) {
       final AtomicBoolean isIdle = new AtomicBoolean();
@@ -216,20 +211,20 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
   }
 
   /**
-   * Clears {selected,recording}TrackId in the {@link SharedPreferences}.
+   * Clears {selected,recording}TrackId in the {@link getSharedPreferences()}.
    */
   private void clearSelectedAndRecordingTracks() {
-    Editor editor = getActivity().getSharedPreferences().edit();
+    Editor editor = getSharedPreferences().edit();
     editor.putLong(getActivity().getString(R.string.selected_track_key), -1);
     editor.putLong(getActivity().getString(R.string.recording_track_key), -1);
-    
+
     editor.clear();
     editor.commit();
   }
-  
+
   /**
    * Waits until the recording state changes to the given status.
-   * 
+   *
    * @param timeout the maximum time to wait, in milliseconds.
    * @param isRecording the final status to await.
    * @return the recording track ID.
@@ -237,14 +232,30 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
   private long awaitRecordingStatus(long timeout, boolean isRecording)
       throws TimeoutException, InterruptedException {
     long startTime = System.nanoTime();
-    while (getActivity().isRecording() != isRecording) {
+    while (isRecording() != isRecording) {
       if (System.nanoTime() - startTime > timeout * 1000000) {
         throw new TimeoutException("Timeout while waiting for recording!");
       }
       Thread.sleep(20);
     }
     waitForIdle();
-    assertEquals(isRecording, getActivity().isRecording());
-    return getActivity().getRecordingTrackId();
+    assertEquals(isRecording, isRecording());
+    return getRecordingTrackId();
+  }
+
+  private long getRecordingTrackId() {
+    return getSharedPreferences().getLong(getActivity().getString(R.string.recording_track_key), -1);
+  }
+
+  private SharedPreferences getSharedPreferences() {
+    if (sharedPreferences == null) {
+      sharedPreferences = getActivity().getSharedPreferences(Constants.SETTINGS_NAME, 0);
+    }
+    return sharedPreferences;
+  }
+
+  private boolean isRecording() {
+    return ServiceUtils.isRecording(getActivity(),
+        serviceConnection.getServiceIfBound(), getSharedPreferences());
   }
 }

MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java

@@ -91,7 +91,12 @@ public class TrackDataHubTest extends AndroidTestCase {
     dataSources = AndroidMock.createNiceMock("dataSources", DataSourcesWrapper.class);
 
     listeners = new TrackDataListeners();
-    hub = new TrackDataHub(context, dataSources, listeners, prefs, providerUtils, TARGET_POINTS) {
+    hub = new TrackDataHub(context, listeners, prefs, providerUtils, TARGET_POINTS) {
+      @Override
+      protected DataSourcesWrapper newDataSources() {
+        return dataSources;
+      }
+
       @Override
       protected void runInListenerThread(Runnable runnable) {
         // Run everything in the same thread.
@@ -124,7 +129,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     AndroidMock.replay(dataSources);
 
     hub.stop();
-    hub.destroy();
+    hub = null;
 
     super.tearDown();
   }

MyTracksTest/src/com/google/android/apps/mytracks/io/file/WriteProgressControllerTest.java

@@ -13,10 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks;
-
-import com.google.android.apps.mytracks.io.file.MockTrackWriter;
-import com.google.android.apps.mytracks.io.file.TrackWriter;
+package com.google.android.apps.mytracks.io.file;
 
 import android.app.ProgressDialog;
 import android.test.ActivityInstrumentationTestCase2;
@@ -29,9 +26,9 @@ import java.util.concurrent.atomic.AtomicReference;
  *
  * @author Matthew Simmons
  */
-public class WriteProgressControllerTest extends ActivityInstrumentationTestCase2<MyTracks> {
+public class WriteProgressControllerTest extends ActivityInstrumentationTestCase2<SaveActivity> {
   public WriteProgressControllerTest() {
-    super(MyTracks.class);
+    super(SaveActivity.class);
   }
 
   private static void assertProgress(ProgressDialog dialog, int expectedProgress,
@@ -57,15 +54,15 @@ public class WriteProgressControllerTest extends ActivityInstrumentationTestCase
     };
 
     WriteProgressController controller = new WriteProgressController(
-        getActivity(), mockWriter);
+        getActivity(), mockWriter, SaveActivity.PROGRESS_DIALOG);
     controller.setOnCompletionListener(new WriteProgressController.OnCompletionListener() {
       @Override
-      public void onComplete(TrackWriter writer) {
+      public void onComplete() {
         controllerDoneRef.set(true);
       }
     });
 
-    dialogRef.set(controller.getDialog());
+    dialogRef.set(controller.createProgressDialog());
 
     controller.startWrite();
 

MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactoryTest.java

@@ -15,7 +15,6 @@
  */
 package com.google.android.apps.mytracks.io.sendtogoogle;
 
-import com.google.android.apps.mytracks.MyTracks;
 import com.google.android.maps.mytracks.R;
 
 import android.app.AlertDialog;
@@ -33,9 +32,9 @@ import java.util.List;
  *
  * @author Matthew Simmons
  */
-public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<MyTracks> {
+public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<SendActivity> {
   public ResultDialogFactoryTest() {
-    super(MyTracks.class);
+    super(SendActivity.class);
   }
 
   private List<SendResult> makeResults(SendResult... results) {
@@ -55,7 +54,7 @@ public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<My
     List<SendResult> results = makeResults(new SendResult(SendType.MYMAPS, true),
         new SendResult(SendType.DOCS, true));
 
-    AlertDialog dialog = ResultDialogFactory.makeDialog(getActivity(), results, clickListener, null);
+    AlertDialog dialog = ResultDialogFactory.makeDialog(getActivity(), results, clickListener, null, null);
     dialog.show();
 
     ListView listView = (ListView) dialog.findViewById(R.id.send_to_google_result_list);
@@ -87,7 +86,7 @@ public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<My
         new SendResult(SendType.DOCS, true));
 
     AlertDialog dialog = ResultDialogFactory.makeDialog(getActivity(), results,
-        clickListener, clickListener);
+        clickListener, clickListener, null);
     dialog.show();
 
     assertEquals(View.VISIBLE, dialog.getButton(AlertDialog.BUTTON_POSITIVE).getVisibility());
@@ -98,7 +97,7 @@ public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<My
     List<SendResult> results = makeResults(new SendResult(SendType.MYMAPS, true),
         new SendResult(SendType.DOCS, false));
 
-    AlertDialog dialog = ResultDialogFactory.makeDialog(getActivity(), results, clickListener, null);
+    AlertDialog dialog = ResultDialogFactory.makeDialog(getActivity(), results, clickListener, null, null);
     dialog.show();
 
     assertEquals(View.GONE,
@@ -112,7 +111,7 @@ public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<My
         new SendResult(SendType.DOCS, false));
 
     AlertDialog dialog = ResultDialogFactory.makeDialog(getActivity(), results,
-        clickListener, clickListener);
+        clickListener, clickListener, null);
     dialog.show();
 
     assertEquals(View.VISIBLE, dialog.getButton(AlertDialog.BUTTON_POSITIVE).getVisibility());

MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java

@@ -49,9 +49,9 @@ import java.util.List;
 
 /**
  * Tests for the MyTracks track recording service.
- * 
+ *
  * @author Bartlomiej Niechwiej
- * 
+ *
  * TODO: The original class, ServiceTestCase, has a few limitations, e.g.
  * it's not possible to properly shutdown the service, unless tearDown()
  * is called, which prevents from testing multiple scenarios in a single
@@ -63,7 +63,7 @@ public class TrackRecordingServiceTest
   private Context context;
   private MyTracksProviderUtils providerUtils;
   private SharedPreferences sharedPreferences;
-  
+
   /*
    * In order to support starting and binding to the service in the same
    * unit test, we provide a workaround, as the original class doesn't allow
@@ -72,19 +72,19 @@ public class TrackRecordingServiceTest
 
   private boolean bound;
   private Intent serviceIntent;
-  
+
   public TrackRecordingServiceTest() {
     super(TrackRecordingService.class);
   }
 
   /**
    * A context wrapper with the user provided {@link ContentResolver}.
-   * 
+   *
    * TODO: Move to test utils package.
    */
   public static class MockContext extends ContextWrapper {
     private final ContentResolver contentResolver;
-    
+
     public MockContext(ContentResolver contentResolver, Context base) {
       super(base);
       this.contentResolver = contentResolver;
@@ -108,7 +108,7 @@ public class TrackRecordingServiceTest
       return 4;
     }
   }
-  
+
   @Override
   protected IBinder bindService(Intent intent) {
     if (getService() != null) {
@@ -190,7 +190,7 @@ public class TrackRecordingServiceTest
     startService(startIntent);
     assertNotNull(getService());
 
-    // We expect to resume the previous track. 
+    // We expect to resume the previous track.
     assertTrue(getService().isRecording());
     ITrackRecordingService service = bindAndGetService(createStartIntent());
     assertEquals(123, service.getRecordingTrackId());
@@ -293,7 +293,7 @@ public class TrackRecordingServiceTest
     assertTrue(tracks.isEmpty());
 
     ITrackRecordingService service = bindAndGetService(createStartIntent());
-    // Test if we start in no-recording mode by default. 
+    // Test if we start in no-recording mode by default.
     assertFalse(service.isRecording());
     assertEquals(-1, service.getRecordingTrackId());
   }
@@ -463,92 +463,19 @@ public class TrackRecordingServiceTest
         context.getString(R.string.recording_track_key), 0));
     assertEquals(-1, service.getRecordingTrackId());
   }
-  
+
   @MediumTest
   public void testIntegration_completeRecordingSession() throws Exception {
     List<Track> tracks = providerUtils.getAllTracks();
     assertTrue(tracks.isEmpty());
     fullRecordingSession();
   }
-  
-  @MediumTest
-  public void testDeleteAllTracks_noRecording() throws Exception {
-    createDummyTrack(123, -1, false);
-    assertEquals(1, providerUtils.getAllTracks().size());
-    
-    ITrackRecordingService service = bindAndGetService(createStartIntent());
-    assertFalse(service.isRecording());
 
-    // Deleting all tracks should succeed.
-    service.deleteAllTracks();
-    assertFalse(service.isRecording());
-    assertTrue(providerUtils.getAllTracks().isEmpty());
-  }
-
-  @MediumTest
-  public void testDeleteAllTracks_noTracks() throws Exception {
-    assertTrue(providerUtils.getAllTracks().isEmpty());
-    
-    ITrackRecordingService service = bindAndGetService(createStartIntent());
-    assertFalse(service.isRecording());
-
-    // Deleting all tracks should succeed.
-    service.deleteAllTracks();
-    assertFalse(service.isRecording());
-    assertTrue(providerUtils.getAllTracks().isEmpty());
-  }
-  
-  @MediumTest
-  public void testDeleteAllTracks_trackInProgress() throws Exception {
-    createDummyTrack(123, -1, true);
-    assertEquals(1, providerUtils.getAllTracks().size());
-
-    ITrackRecordingService service = bindAndGetService(createStartIntent());
-    assertTrue(service.isRecording());
-
-    // Since we have a track in progress, we expect to fail.
-    try {
-      service.deleteAllTracks();
-      fail("Expecting IllegalStateException");
-    } catch (IllegalStateException e) {
-      // Expected.
-    }
-    assertTrue(service.isRecording());
-    assertEquals(1, providerUtils.getAllTracks().size());
-  }
-  
-  @MediumTest
-  public void testHasRecorded_noTracks() throws Exception {
-    ITrackRecordingService service = bindAndGetService(createStartIntent());
-    assertFalse(service.isRecording());
-    assertFalse(service.hasRecorded());
-  }
-  
-  @MediumTest
-  public void testHasRecorded_trackInProgress() throws Exception {
-    createDummyTrack(123, -1, true);
-    assertEquals(1, providerUtils.getAllTracks().size());
-    
-    ITrackRecordingService service = bindAndGetService(createStartIntent());
-    assertTrue(service.isRecording());
-    assertTrue(service.hasRecorded());
-  }
-  
-  @MediumTest
-  public void testHasRecorded_oldTracks() throws Exception {
-    createDummyTrack(123, -1, false);
-    assertEquals(1, providerUtils.getAllTracks().size());
-    
-    ITrackRecordingService service = bindAndGetService(createStartIntent());
-    assertFalse(service.isRecording());
-    assertTrue(service.hasRecorded());
-  }
-  
   @MediumTest
   public void testInsertStatisticsMarker_noRecordingTrack() throws Exception {
     ITrackRecordingService service = bindAndGetService(createStartIntent());
     assertFalse(service.isRecording());
-    
+
     try {
       service.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS);
       fail("Expecting IllegalStateException");
@@ -556,17 +483,17 @@ public class TrackRecordingServiceTest
       // Expected.
     }
   }
-  
+
   @MediumTest
   public void testInsertStatisticsMarker_validLocation() throws Exception {
     createDummyTrack(123, -1, true);
-    
+
     ITrackRecordingService service = bindAndGetService(createStartIntent());
     assertTrue(service.isRecording());
-    
+
     assertEquals(1, service.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS));
     assertEquals(2, service.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS));
-    
+
     Waypoint wpt = providerUtils.getWaypoint(1);
     assertEquals(getContext().getString(R.string.stats_icon_url),
         wpt.getIcon());
@@ -586,7 +513,7 @@ public class TrackRecordingServiceTest
   public void testInsertWaypointMarker_noRecordingTrack() throws Exception {
     ITrackRecordingService service = bindAndGetService(createStartIntent());
     assertFalse(service.isRecording());
-    
+
     try {
       service.insertWaypoint(WaypointCreationRequest.DEFAULT_MARKER);
       fail("Expecting IllegalStateException");
@@ -594,14 +521,14 @@ public class TrackRecordingServiceTest
       // Expected.
     }
   }
-  
+
   @MediumTest
   public void testInsertWaypointMarker_validWaypoint() throws Exception {
     createDummyTrack(123, -1, true);
-    
+
     ITrackRecordingService service = bindAndGetService(createStartIntent());
     assertTrue(service.isRecording());
-    
+
     assertEquals(1, service.insertWaypoint(WaypointCreationRequest.DEFAULT_MARKER));
     Waypoint wpt = providerUtils.getWaypoint(1);
     assertEquals(getContext().getString(R.string.waypoint_icon_url),
@@ -614,7 +541,7 @@ public class TrackRecordingServiceTest
     assertNotNull(wpt.getLocation());
     assertNull(wpt.getStatistics());
   }
-  
+
   @MediumTest
   public void testWithProperties_noAnnouncementFreq() throws Exception {
     functionalTest(R.string.announcement_frequency_key, (Object) null);
@@ -624,7 +551,7 @@ public class TrackRecordingServiceTest
   public void testWithProperties_defaultAnnouncementFreq() throws Exception {
     functionalTest(R.string.announcement_frequency_key, 1);
   }
-  
+
   @MediumTest
   public void testWithProperties_noMaxRecordingDist() throws Exception {
     functionalTest(R.string.max_recording_distance_key, (Object) null);
@@ -654,7 +581,7 @@ public class TrackRecordingServiceTest
   public void testWithProperties_defaultSplitFreqByDist() throws Exception {
     functionalTest(R.string.split_frequency_key, 5);
   }
- 
+
   @MediumTest
   public void testWithProperties_defaultSplitFreqByTime() throws Exception {
     functionalTest(R.string.split_frequency_key, -2);
@@ -674,7 +601,7 @@ public class TrackRecordingServiceTest
   public void testWithProperties_metricUnitsDisabled() throws Exception {
     functionalTest(R.string.metric_units_key, false);
   }
-  
+
   @MediumTest
   public void testWithProperties_noMinRecordingInterval() throws Exception {
     functionalTest(R.string.min_recording_interval_key, (Object) null);
@@ -690,23 +617,23 @@ public class TrackRecordingServiceTest
   public void testWithProperties_noMinRequiredAccuracy() throws Exception {
     functionalTest(R.string.min_required_accuracy_key, (Object) null);
   }
-  
+
   @MediumTest
   public void testWithProperties_defaultMinRequiredAccuracy() throws Exception {
     functionalTest(R.string.min_required_accuracy_key, 500);
   }
-  
+
   @MediumTest
   public void testWithProperties_noSensorType() throws Exception {
     functionalTest(R.string.sensor_type_key, (Object) null);
   }
-  
+
   @MediumTest
   public void testWithProperties_zephyrSensorType() throws Exception {
     functionalTest(R.string.sensor_type_key,
-    		context.getString(R.string.zephyr_sensor_type));
+        context.getString(R.string.zephyr_sensor_type));
   }
-  
+
   private ITrackRecordingService bindAndGetService(Intent intent) {
     ITrackRecordingService service = ITrackRecordingService.Stub.asInterface(
         bindService(intent));
@@ -724,7 +651,7 @@ public class TrackRecordingServiceTest
     addTrack(dummyTrack, isRecording);
     return dummyTrack;
   }
-  
+
   private void updateAutoResumePrefs(int attempts, int timeoutMins) {
     Editor editor = sharedPreferences.edit();
     editor.putInt(context.getString(
@@ -733,20 +660,20 @@ public class TrackRecordingServiceTest
         R.string.auto_resume_track_timeout_key), timeoutMins);
     editor.commit();
   }
-  
+
   private Intent createStartIntent() {
     Intent startIntent = new Intent();
     startIntent.setClass(context, TrackRecordingService.class);
     return startIntent;
   }
-  
+
   private void addTrack(Track track, boolean isRecording) {
     assertTrue(track.getId() >= 0);
     providerUtils.insertTrack(track);
     assertEquals(track.getId(), providerUtils.getTrack(track.getId()).getId());
     setRecordingTrack(isRecording ? track.getId() : -1);
   }
-  
+
   private void setRecordingTrack(long id) {
     Editor editor = sharedPreferences.edit();
     editor.putLong(context.getString(R.string.recording_track_key), id);
@@ -760,11 +687,11 @@ public class TrackRecordingServiceTest
       throws Exception {
     final String key = context.getString(resourceId);
     for (Object value : values) {
-      // Remove all properties and set the property for the given key. 
+      // Remove all properties and set the property for the given key.
       Editor editor = sharedPreferences.edit();
       editor.clear();
       if (value instanceof String) {
-        editor.putString(key, (String) value); 
+        editor.putString(key, (String) value);
       } else if (value instanceof Long) {
         editor.putLong(key, (Long) value);
       } else if (value instanceof Integer) {
@@ -775,15 +702,15 @@ public class TrackRecordingServiceTest
         // Do nothing, as clear above has already removed this property.
       }
       editor.commit();
-      
+
       fullRecordingSession();
     }
   }
-  
+
   private void fullRecordingSession() throws Exception {
     ITrackRecordingService service = bindAndGetService(createStartIntent());
     assertFalse(service.isRecording());
-    
+
     // Start a track.
     long id = service.startNewTrack();
     assertTrue(id >= 0);
@@ -806,14 +733,14 @@ public class TrackRecordingServiceTest
       loc.setTime(startTime + i * 10000);
       loc.setBearing(3.0f);
       service.recordLocation(loc);
-      
+
       if (i % 10 == 0) {
         service.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS);
       } else if (i % 7 == 0) {
         service.insertWaypoint(WaypointCreationRequest.DEFAULT_MARKER);
       }
     }
-    
+
     // Stop the track.  Validate if it has correct data.
     service.endCurrentTrack();
     assertFalse(service.isRecording());

MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java

@@ -0,0 +1,70 @@
+package com.google.android.apps.mytracks.services.sensors;
+
+import java.util.Arrays;
+
+import com.google.android.apps.mytracks.content.Sensor;
+
+import junit.framework.TestCase;
+
+public class PolarMessageParserTest extends TestCase {
+
+  PolarMessageParser parser = new PolarMessageParser();
+  // A complete and valid Polar HxM packet
+  //   FE08F701D1001104FE08F702D1001104
+  private final byte[] originalBuf =
+    {(byte) 0xFE, 0x08, (byte) 0xF7, 0x01, (byte) 0xD1, 0x00, 0x11, 0x04, (byte) 0xFE, 0x08,
+     (byte) 0xF7, 0x02, (byte) 0xD1, 0x00, 0x11, 0x04};
+  private byte[] buf;
+  
+  public void setUp() {
+    buf = Arrays.copyOf(originalBuf, originalBuf.length);
+  }
+
+  public void testIsValid() {
+	assertTrue(parser.isValid(buf));
+  }
+  
+  public void testIsValid_invalidHeader() {
+	// Invalidate header.
+    buf[0] = 0x03;
+    assertFalse(parser.isValid(buf));
+  }
+  
+  public void testIsValid_invalidCheckbyte() {
+	// Invalidate checkbyte.
+    buf[2] = 0x03;
+    assertFalse(parser.isValid(buf));
+  }
+  
+  public void testIsValid_invalidSequence() {
+    // Invalidate sequence.
+    buf[3] = 0x11;
+    assertFalse(parser.isValid(buf));
+  }
+
+  public void testParseBuffer() {
+    buf[5] = 70;
+    Sensor.SensorDataSet sds = parser.parseBuffer(buf);
+    assertTrue(sds.hasHeartRate());
+    assertTrue(sds.getHeartRate().getState() == Sensor.SensorState.SENDING);
+    assertEquals(70, sds.getHeartRate().getValue());
+  }
+
+  public void testFindNextAlignment_offset() {
+	// The first 4 bytes are garbage
+	buf = new byte[originalBuf.length + 4];
+	buf[0] = 4;
+	buf[1] = 2;
+	buf[2] = 4;
+	buf[3] = 2;
+	
+	// Then the valid message.
+	System.arraycopy(originalBuf, 0, buf, 4, originalBuf.length);
+    assertEquals(4, parser.findNextAlignment(buf));
+  }
+
+  public void testFindNextAlignment_invalid() {
+    buf[0] = 0;
+    assertEquals(-1, parser.findNextAlignment(buf));
+  }
+}