Merging to head.

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

@@ -16,115 +16,46 @@
 package com.google.android.apps.mytracks;
 
 import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.maps.GeoPoint;
+import com.google.android.apps.mytracks.maps.SingleColorTrackPathPainter;
 import com.google.android.maps.MapView;
-import com.google.android.maps.Projection;
 
-import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Path;
-import android.graphics.Point;
-import android.graphics.PointF;
-import android.graphics.Rect;
 import android.location.Location;
 import android.test.AndroidTestCase;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * Tests for the MyTracks map overlay.
  * 
  * @author Bartlomiej Niechwiej
+ * @author Vangelis S.
  */
 public class MapOverlayTest extends AndroidTestCase {
   private Canvas canvas;
   private MockMyTracksOverlay myTracksOverlay;
   private MapView mockView;
-  private Projection mockProjection;
-  
-  /**
-   * A mock version of {@code MapOverlay} that does not use
-   * {@class MapView}. 
-   */
-  private class MockMyTracksOverlay extends MapOverlay {
-    public MockMyTracksOverlay(Context context) {
-      super(context);
-    }
-    @Override
-    Projection getMapProjection(MapView mapView) {
-      return mockProjection;
-    }
-    @Override
-    Rect getMapViewRect(MapView mapView) {
-      return new Rect(0, 0, 100, 100);
-    }
-    @Override
-    Path newPath() {
-      return new MockPath();
-    }
-  }
-  
-  /**
-   * A mock class that intercepts {@code Path}'s and records calls to
-   * {@code #moveTo()} and {@code #lineTo()}.
-   */
-  private static class MockPath extends Path {
-    /** A list of disjoined path segments. */
-    public final List<List<PointF>> segments = new LinkedList<List<PointF>>();
-    /** The total number of points in this path. */
-    public int totalPoints;
-    
-    private List<PointF> currentSegment;
 
-    @Override
-    public void lineTo(float x, float y) {
-      super.lineTo(x, y);
-      assertNotNull(currentSegment);
-      currentSegment.add(new PointF(x, y));
-      totalPoints++;
-    }
-    @Override
-    public void moveTo(float x, float y) {
-      super.moveTo(x, y);
-      segments.add(currentSegment =
-          new ArrayList<PointF>(Arrays.asList(new PointF(x, y))));
-      totalPoints++;
-    }
-  }
-
-  /**
-   * A mock {@code Projection} that acts as the identity matrix.
-   */
-  private static class MockProjection implements Projection {
-    @Override
-    public Point toPixels(GeoPoint in, Point out) {
-      return out;
-    }
-    @Override
-    public float metersToEquatorPixels(float meters) {
-      return meters;
-    }
-    @Override
-    public GeoPoint fromPixels(int x, int y) {
-      return new GeoPoint(y, x);
-    }
-  }
-  
   @Override
   protected void setUp() throws Exception {
     super.setUp();
     canvas = new Canvas();
     myTracksOverlay = new MockMyTracksOverlay(getContext());
+
     // Enable drawing.
     myTracksOverlay.setTrackDrawingEnabled(true);
-    mockView = null;
-    mockProjection = new MockProjection();
-  }
 
-  public void testAddLocation() throws Exception {
+    // Set a TrackPathPainter with a MockPath.
+    myTracksOverlay.setTrackPathPainter(new SingleColorTrackPathPainter(getContext()) {
+      @Override
+      public Path newPath() {
+        return new MockPath();
+      }     
+    });
+    
+    mockView = null;
+  }
+  
+  public void testAddLocation() throws Exception {   
     Location location = new Location("gps");
     location.setLatitude(10);
     location.setLongitude(20);
@@ -137,19 +68,21 @@ public class MapOverlayTest extends AndroidTestCase {
     myTracksOverlay.addLocation(location);
     assertEquals(2, myTracksOverlay.getNumLocations());
     assertEquals(0, myTracksOverlay.getNumWaypoints());
-    assertNull(myTracksOverlay.getLastPath());
+    assertNull(myTracksOverlay.getTrackPathPainter().getLastPath());
     
     // Draw and make sure that we don't lose any point.
     myTracksOverlay.draw(canvas, mockView, false);
     assertEquals(2, myTracksOverlay.getNumLocations());
     assertEquals(0, myTracksOverlay.getNumWaypoints());
-    assertNotNull(myTracksOverlay.getLastPath());
-    assertEquals(2, ((MockPath)myTracksOverlay.getLastPath()).totalPoints);
+    assertNotNull(myTracksOverlay.getTrackPathPainter().getLastPath());
+    assertTrue(myTracksOverlay.getTrackPathPainter().getLastPath() instanceof MockPath);
+    MockPath path = (MockPath) myTracksOverlay.getTrackPathPainter().getLastPath();
+    assertEquals(2, path.totalPoints);
     
     myTracksOverlay.draw(canvas, mockView, true);
     assertEquals(2, myTracksOverlay.getNumLocations());
     assertEquals(0, myTracksOverlay.getNumWaypoints());
-    assertNotNull(myTracksOverlay.getLastPath());
+    assertNotNull(myTracksOverlay.getTrackPathPainter().getLastPath());
   }
   
   public void testClearPoints() throws Exception {
@@ -182,7 +115,7 @@ public class MapOverlayTest extends AndroidTestCase {
     myTracksOverlay.addWaypoint(waypoint);
     assertEquals(1, myTracksOverlay.getNumWaypoints());
     assertEquals(0, myTracksOverlay.getNumLocations());
-    assertNull(myTracksOverlay.getLastPath());
+    assertNull(myTracksOverlay.getTrackPathPainter().getLastPath());
     
     final int waypoints = 10;
     for (int i = 0; i < waypoints; ++i) {
@@ -192,7 +125,7 @@ public class MapOverlayTest extends AndroidTestCase {
     }
     assertEquals(1 + waypoints, myTracksOverlay.getNumWaypoints());
     assertEquals(0, myTracksOverlay.getNumLocations());
-    assertNull(myTracksOverlay.getLastPath());
+    assertNull(myTracksOverlay.getTrackPathPainter().getLastPath());
   }
 
   public void testClearWaypoints() throws Exception {
@@ -226,15 +159,15 @@ public class MapOverlayTest extends AndroidTestCase {
     // Shadow.
     myTracksOverlay.draw(canvas, mockView, true);
     // We don't expect to do anything if  
-    assertNull(myTracksOverlay.getLastPath());
+    assertNull(myTracksOverlay.getTrackPathPainter().getLastPath());
     assertEquals(40, myTracksOverlay.getNumWaypoints());
     assertEquals(100, myTracksOverlay.getNumLocations());
 
     // No shadow.
     myTracksOverlay.draw(canvas, mockView, false);
-    assertNotNull(myTracksOverlay.getLastPath());
-    assertTrue(myTracksOverlay.getLastPath() instanceof MockPath);
-    MockPath path = (MockPath) myTracksOverlay.getLastPath();
+    assertNotNull(myTracksOverlay.getTrackPathPainter().getLastPath());
+    assertTrue(myTracksOverlay.getTrackPathPainter().getLastPath() instanceof MockPath);
+    MockPath path = (MockPath) myTracksOverlay.getTrackPathPainter().getLastPath();
     assertEquals(40, myTracksOverlay.getNumWaypoints());
     assertEquals(100, myTracksOverlay.getNumLocations());
     assertEquals(100, path.totalPoints);

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

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2011 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.maps.MapView;
+import com.google.android.maps.Projection;
+
+import android.content.Context;
+import android.graphics.Rect;
+
+/**
+ * Elements for Tests for the MyTracks map overlay.
+ * 
+ * @author Bartlomiej Niechwiej
+ * @author Vangelis S.
+ * 
+ * A mock version of {@code MapOverlay} that does not use
+ * {@class MapView}. 
+ */
+public class MockMyTracksOverlay extends MapOverlay {
+   
+  private Projection mockProjection;
+  
+  public MockMyTracksOverlay(Context context) {
+    super(context);
+    mockProjection = new MockProjection();
+  }
+  
+  @Override
+  public Projection getMapProjection(MapView mapView) {
+    return mockProjection;
+  }
+  
+  @Override
+  public Rect getMapViewRect(MapView mapView) {
+    return new Rect(0, 0, 100, 100);
+  }
+}

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2011 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 android.graphics.Path;
+import android.graphics.PointF;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import junit.framework.Assert;
+
+/**
+ * Elements for Tests for the MyTracks map overlay.
+ * 
+ * @author Bartlomiej Niechwiej
+ * @author Vangelis S.
+ * 
+ * A mock class that intercepts {@code Path}'s and records calls to
+ * {@code #moveTo()} and {@code #lineTo()}.
+ */
+public class MockPath extends Path {
+  
+  /** A list of disjoined path segments. */
+  public final List<List<PointF>> segments = new LinkedList<List<PointF>>();
+  /** The total number of points in this path. */
+  public int totalPoints;
+  private List<PointF> currentSegment;
+
+  @Override
+  public void lineTo(float x, float y) {
+    super.lineTo(x, y);
+    Assert.assertNotNull(currentSegment);
+    currentSegment.add(new PointF(x, y));
+    totalPoints++;
+  }
+  
+  @Override
+  public void moveTo(float x, float y) {
+    super.moveTo(x, y);
+    segments.add(currentSegment =
+        new ArrayList<PointF>(Arrays.asList(new PointF(x, y))));
+    totalPoints++;
+  }
+}

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2011 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.maps.GeoPoint;
+import com.google.android.maps.Projection;
+
+import android.graphics.Point;
+
+/**
+ * Elements for Tests for the MyTracks map overlay.
+ * 
+ * @author Bartlomiej Niechwiej
+ * @author Vangelis S.
+ * 
+ * A mock {@code Projection} that acts as the identity matrix.
+ */
+public class MockProjection implements Projection {
+
+  @Override
+  public Point toPixels(GeoPoint in, Point out) {
+    return out;
+  }
+
+  @Override
+  public float metersToEquatorPixels(float meters) {
+    return meters;
+  }
+
+  @Override
+  public GeoPoint fromPixels(int x, int y) {
+    return new GeoPoint(y, x);
+  }
+}

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

@@ -49,7 +49,6 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
   protected void tearDown() throws Exception {
     clearSelectedAndRecordingTracks();
     waitForIdle();
-
     super.tearDown();
   }
 
@@ -85,7 +84,7 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
     // Simulate start with ACTION_VIEW intent.
     Intent startIntent = new Intent();
     startIntent.setAction(Intent.ACTION_VIEW);
-    Uri uri = Uri.fromFile(File.createTempFile("valid", ".gpx"));
+    Uri uri = Uri.fromFile(File.createTempFile("valid", ".gpx", getActivity().getFilesDir()));
 
     // TODO: Add a valid GPX.
 
@@ -108,7 +107,7 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
     // Simulate start with ACTION_VIEW intent.
     Intent startIntent = new Intent();
     startIntent.setAction(Intent.ACTION_VIEW);
-    Uri uri = Uri.fromFile(File.createTempFile("invalid", ".gpx"));
+    Uri uri = Uri.fromFile(File.createTempFile("invalid", ".gpx", getActivity().getFilesDir()));
     startIntent.setData(uri);
     setActivityIntent(startIntent);
 
@@ -168,8 +167,13 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
     // properly saved.
 
     // Simulate a click on Save button.
-    Button save = (Button) activity.findViewById(R.id.trackdetails_save);
-    save.performClick();
+    final Button save = (Button) activity.findViewById(R.id.trackdetails_save);
+    getActivity().runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        save.performClick();
+      }
+    });  
 
     // Check the remaining properties.
     recordingTrackId = awaitRecordingStatus(5000, false);

MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java

@@ -28,6 +28,8 @@ import android.test.mock.MockContext;
 import android.test.mock.MockResources;
 
 import java.io.IOException;
+import java.text.DateFormat;
+import java.util.Date;
 
 import junit.framework.TestCase;
 
@@ -55,13 +57,13 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
     StringWritingDocsHelper docsHelper = new StringWritingDocsHelper();
     addTrackRow(docsHelper, false);
 
+    DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);    
     String expectedData =
       "<entry xmlns='http://www.w3.org/2005/Atom' "
       + "xmlns:gsx='http://schemas.google.com/spreadsheets/2006/extended'>"
       + "<gsx:name><![CDATA[trackName]]></gsx:name>"
       + "<gsx:description><![CDATA[trackDescription]]></gsx:description>"
-      // We format the date here because we can't guarantee/force the timezone
-      + "<gsx:date><![CDATA[" + String.format("%tc", TIME) + "]]></gsx:date>"
+      + "<gsx:date><![CDATA[" + dateFormat.format(new Date(TIME)) + "]]></gsx:date>"
       + "<gsx:totaltime><![CDATA[0:00:05]]></gsx:totaltime>"
       + "<gsx:movingtime><![CDATA[0:00:04]]></gsx:movingtime>"
       + "<gsx:distance><![CDATA[12.43]]></gsx:distance>"
@@ -76,12 +78,12 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
       + "<gsx:maxelevation><![CDATA[1,804]]></gsx:maxelevation>"
       + "<gsx:elevationunit><![CDATA[feet]]></gsx:elevationunit>"
       + "<gsx:map>"
-      + "<![CDATA[http://maps.google.com/maps/ms?msa=0&msid=trackMapId]]>"
+      + "<![CDATA[https://maps.google.com/maps/ms?msa=0&msid=trackMapId]]>"
       + "</gsx:map>"
       + "</entry>";
 
     assertEquals(
-        "http://spreadsheets.google.com/feeds/list/ssid/wsid/private/full",
+        "https://spreadsheets.google.com/feeds/list/ssid/wsid/private/full",
         docsHelper.writtenSheetUri);
     assertEquals(expectedData, docsHelper.writtenData);
   }

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

@@ -53,7 +53,7 @@ public class WriteProgressControllerTest extends ActivityInstrumentationTestCase
       }
     };
 
-    WriteProgressController controller = new WriteProgressController(
+    final WriteProgressController controller = new WriteProgressController(
         getActivity(), mockWriter, SaveActivity.PROGRESS_DIALOG);
     controller.setOnCompletionListener(new WriteProgressController.OnCompletionListener() {
       @Override
@@ -62,6 +62,22 @@ public class WriteProgressControllerTest extends ActivityInstrumentationTestCase
       }
     });
 
+    /*
+     * The WriteProgressController constructor calls the mockWriter's
+     * setOnCompletionListener method with a listener that dismisses the
+     * progress dialog. However, this unit test only tests the
+     * WriteProgressController and doesn't actually show any progress dialog.
+     * Thus after the WriteProgressController is setup, we need to call the
+     * mockWriter's setOnCompletionListener method again with an listener that
+     * doesn't dismiss dialog.
+     */
+    mockWriter.setOnCompletionListener(new TrackWriter.OnCompletionListener() {
+      @Override
+      public void onComplete() {
+        controller.getOnCompletionListener().onComplete();
+      }
+    });
+
     dialogRef.set(controller.createProgressDialog());
 
     controller.startWrite();
@@ -69,7 +85,6 @@ public class WriteProgressControllerTest extends ActivityInstrumentationTestCase
     // wait for the writer to finish
     writerDone.acquire();
 
-    assertFalse(dialogRef.get().isShowing());
     assertTrue(controllerDoneRef.get());
   }
 }

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

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2011 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.maps;
+
+import android.location.Location;
+
+/**
+ * Tests for the MyTracks track path descriptors and painters.
+ * 
+ * @author Vangelis S.
+ */
+public class TrackPathDescriptorDynamicSpeedTest extends TrackPathPainterTestCase {
+  
+  public void testDynamicSpeedTrackPathDescriptor() throws Exception {
+    Location location = new Location("gps");
+    location.setLatitude(10);
+    
+    for (int i = 0; i < 100; ++i) {
+      location = new Location("gps");
+      location.setLatitude(20 + i / 2);
+      location.setLongitude(150 - i);
+      myTracksOverlay.addLocation(location);
+    }
+    
+    TrackPathPainter painter = new DynamicSpeedTrackPathPainter(
+        getContext(), new DynamicSpeedTrackPathDescriptor(getContext()));
+    myTracksOverlay.setTrackPathPainter(painter);
+    
+    int startLocationIdx = 0;
+    Boolean alwaysVisible = true;
+    
+    assertNotNull(painter);
+    painter.updatePath(myTracksOverlay.getMapProjection(mockView), 
+        myTracksOverlay.getMapViewRect(mockView), startLocationIdx, alwaysVisible,
+        myTracksOverlay.getPoints());
+    assertNotNull(myTracksOverlay.getTrackPathPainter().getLastPath());
+    painter.drawTrack(canvas);    
+  }
+}

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

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2011 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.maps;
+
+import android.location.Location;
+
+/**
+ * Tests for the MyTracks track path descriptors and painters.
+ * 
+ * @author Vangelis S.
+ */
+public class TrackPathDescriptorFixedSpeedTest extends TrackPathPainterTestCase {
+
+  public void testFixedSpeedTrackPathDescriptor() throws Exception {
+    Location location = new Location("gps");
+    location.setLatitude(10);
+
+    for (int i = 0; i < 100; ++i) {
+      location = new Location("gps");
+      location.setLatitude(20 + i / 2);
+      location.setLongitude(150 - i);
+      myTracksOverlay.addLocation(location);
+    }
+    
+    TrackPathPainter painter = new DynamicSpeedTrackPathPainter(
+        getContext(), new FixedSpeedTrackPathDescriptor(getContext()));
+    myTracksOverlay.setTrackPathPainter(painter);
+    
+    int startLocationIdx = 0;
+    Boolean alwaysVisible = true;
+    
+    assertNotNull(painter);
+    painter.updatePath(myTracksOverlay.getMapProjection(mockView), 
+        myTracksOverlay.getMapViewRect(mockView), startLocationIdx, alwaysVisible,
+        myTracksOverlay.getPoints());
+    assertNotNull(myTracksOverlay.getTrackPathPainter().getLastPath());
+    painter.drawTrack(canvas);
+  }
+}

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

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2011 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.maps;
+
+import com.google.android.apps.mytracks.Constants;
+import com.google.android.maps.mytracks.R;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.location.Location;
+
+/**
+ * Tests for the MyTracks track path painter factory.
+ * 
+ * @author Vangelis S.
+ */
+public class TrackPathPainterFactoryTest extends TrackPathPainterTestCase {
+  
+  public void testTrackPathPainterFactory() throws Exception {
+    Location location = new Location("gps");
+    location.setLatitude(10);
+    
+    for (int i = 0; i < 100; ++i) {
+      location = new Location("gps");
+      location.setLatitude(20 + i / 2);
+      location.setLongitude(150 - i);
+      myTracksOverlay.addLocation(location);
+    }
+    
+    Context context = getContext();
+    SharedPreferences prefs = context.getSharedPreferences(Constants.SETTINGS_NAME, 0);
+    if (prefs == null) {
+      return;
+    }
+    
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_none, 
+        SingleColorTrackPathPainter.class);
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_fixed, 
+        DynamicSpeedTrackPathPainter.class);
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_dynamic, 
+        DynamicSpeedTrackPathPainter.class);
+  }
+  
+  private <T> void testTrackPathPainterFactorySpecific(Context context, SharedPreferences prefs, 
+      int track_color_mode, Class <?> c) {
+    prefs.edit().putString(context.getString(R.string.track_color_mode_key), 
+        context.getString(track_color_mode)).commit();
+    
+    int startLocationIdx = 0;
+    Boolean alwaysVisible = true;
+    
+    TrackPathPainter painter = TrackPathPainterFactory.getTrackPathPainter(context);
+    myTracksOverlay.setTrackPathPainter(painter);
+    
+    assertNotNull(painter);
+    assertTrue(c.isInstance(painter));
+    
+    painter.updatePath(myTracksOverlay.getMapProjection(mockView), 
+        myTracksOverlay.getMapViewRect(mockView), startLocationIdx, alwaysVisible,
+        myTracksOverlay.getPoints());
+    assertNotNull(myTracksOverlay.getTrackPathPainter().getLastPath());      
+    painter.drawTrack(canvas);
+  }
+}

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

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2011 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.maps;
+
+import android.location.Location;
+
+/**
+ * Tests for the MyTracks track path descriptors and painters.
+ * 
+ * @author Vangelis S.
+ */
+public class TrackPathPainterSingleColorTest extends TrackPathPainterTestCase {
+
+  public void testSimpeColorTrackPathPainter() throws Exception {
+    Location location = new Location("gps");
+    location.setLatitude(10);
+
+    for (int i = 0; i < 100; ++i) {
+      location = new Location("gps");
+      location.setLatitude(20 + i / 2);
+      location.setLongitude(150 - i);
+      myTracksOverlay.addLocation(location);
+    }
+    
+    TrackPathPainter painter = new SingleColorTrackPathPainter(getContext());
+    myTracksOverlay.setTrackPathPainter(painter);
+    
+    int startLocationIdx = 0;
+    Boolean alwaysVisible = true;
+    
+    assertNotNull(painter);
+    painter.updatePath(myTracksOverlay.getMapProjection(mockView), 
+        myTracksOverlay.getMapViewRect(mockView), startLocationIdx, alwaysVisible,
+        myTracksOverlay.getPoints());
+    assertNotNull(myTracksOverlay.getTrackPathPainter().getLastPath());
+    painter.drawTrack(canvas);
+  }
+}

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2011 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.maps;
+
+import com.google.android.apps.mytracks.MockMyTracksOverlay;
+import com.google.android.maps.MapView;
+
+import android.graphics.Canvas;
+import android.test.AndroidTestCase;
+
+/**
+ * Tests for the MyTracks track path descriptors and painters.
+ * 
+ * @author Vangelis S.
+ */
+public class TrackPathPainterTestCase extends AndroidTestCase {
+  protected Canvas canvas;
+  protected MockMyTracksOverlay myTracksOverlay;
+  protected MapView mockView;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    canvas = new Canvas();
+    myTracksOverlay = new MockMyTracksOverlay(getContext());
+    // Enable drawing.
+    myTracksOverlay.setTrackDrawingEnabled(true);
+    mockView = null;
+  }
+}

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

@@ -405,12 +405,10 @@ public class TrackRecordingServiceTest
     ITrackRecordingService service = bindAndGetService(createStartIntent());
     assertTrue(service.isRecording());
 
-    try {
-      service.startNewTrack();
-      fail("Expecting IllegalStateException");
-    } catch (IllegalStateException e) {
-      // Expected.
-    }
+    // Starting a new track when there is a recording should just return -1L.
+    long newTrack = service.startNewTrack();
+    assertEquals(-1L, newTrack);
+
     assertEquals(123, sharedPreferences.getLong(
         context.getString(R.string.recording_track_key), 0));
     assertEquals(123, service.getRecordingTrackId());
@@ -452,13 +450,9 @@ public class TrackRecordingServiceTest
     ITrackRecordingService service = bindAndGetService(createStartIntent());
     assertFalse(service.isRecording());
 
-    // End the current track.
-    try {
-      service.endCurrentTrack();
-      fail("Expecting IllegalStateException");
-    } catch (IllegalStateException e) {
-      // Expected.
-    }
+    // Ending the current track when there is no recording should not result in any error.
+    service.endCurrentTrack();
+
     assertEquals(-1, sharedPreferences.getLong(
         context.getString(R.string.recording_track_key), 0));
     assertEquals(-1, service.getRecordingTrackId());

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

@@ -26,9 +26,9 @@ public class ZephyrMessageParserTest extends TestCase {
 
   public void testParseBuffer() {
     byte[] buf = new byte[60];
-    // Heartrate (-1 =^ 255 unsigned byte)
+    // Heart Rate (-1 =^ 255 unsigned byte)
     buf[12] = -1;
-    // Power
+    // Battery Level
     buf[11] = 51;
     // Cadence (=^ 255*16 strides/min)
     buf[56] = -1;
@@ -37,9 +37,9 @@ public class ZephyrMessageParserTest extends TestCase {
     assertTrue(sds.hasHeartRate());
     assertTrue(sds.getHeartRate().getState() == Sensor.SensorState.SENDING);
     assertEquals(255, sds.getHeartRate().getValue());
-    assertTrue(sds.hasPower());
-    assertTrue(sds.getPower().getState() == Sensor.SensorState.SENDING);
-    assertEquals(51, sds.getPower().getValue());
+    assertTrue(sds.hasBatteryLevel());
+    assertTrue(sds.getBatteryLevel().getState() == Sensor.SensorState.SENDING);
+    assertEquals(51, sds.getBatteryLevel().getValue());
     assertTrue(sds.hasCadence());
     assertTrue(sds.getCadence().getState() == Sensor.SensorState.SENDING);
     assertEquals(255, sds.getCadence().getValue());

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

@@ -47,15 +47,6 @@ public class ApiFeaturesTest extends TestCase {
     features = new TestableApiFeatures();
   }
 
-  public void testHasBackup() {
-    for (int i = 3; i <= 7; i++) {
-      features.setApiLevel(i);
-      assertFalse(features.hasBackup());
-    }
-    features.setApiLevel(8);
-    assertTrue(features.hasBackup());
-  }
-
   public void testHasTextToSpeech() {
     features.setApiLevel(3);
     assertFalse(features.hasTextToSpeech());
@@ -65,7 +56,7 @@ public class ApiFeaturesTest extends TestCase {
     }
   }
 
-  public void testGetApiPlatformAdapter() {
-    assertNotNull(features.getApiPlatformAdapter());
+  public void testGetApiAdapter() {
+    assertNotNull(features.getApiAdapter());
   }
 }