Merge heads

MyTracksTest/.settings/org.eclipse.jdt.core.prefs

@@ -1,13 +1,10 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -16,7 +13,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
@@ -24,12 +21,15 @@ org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
@@ -38,21 +38,31 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warni
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
@@ -74,7 +84,6 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=enabled
-org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=1585
 org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field.count_dependent=1585|-1|1585

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

@@ -17,6 +17,7 @@ package com.google.android.apps.mytracks.content;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils.LocationFactory;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils.LocationIterator;
+import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.testing.mocking.AndroidMock;
@@ -365,7 +366,7 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     // Insert at first.
     Waypoint waypoint = new Waypoint();
     waypoint.setDescription(TEST_DESC);
-    waypoint.setType(Waypoint.TYPE_STATISTICS);
+    waypoint.setType(WaypointType.STATISTICS);
     waypoint.setTripStatistics(statistics);
     
     Location loc = new Location("test");
@@ -442,7 +443,7 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     Waypoint waypoint1 = new Waypoint();
     waypoint1.setDescription(TEST_DESC);
     waypoint1.setTrackId(trackId);
-    waypoint1.setType(Waypoint.TYPE_STATISTICS);
+    waypoint1.setType(WaypointType.STATISTICS);
     providerUtils.insertWaypoint(waypoint1);
   
     // Delete
@@ -491,13 +492,13 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     Waypoint waypoint1 = new Waypoint();
     waypoint1.setDescription(Long.toString(trackId));
     waypoint1.setTrackId(trackId);
-    waypoint1.setType(Waypoint.TYPE_STATISTICS);
+    waypoint1.setType(WaypointType.STATISTICS);
     waypoint1.setTripStatistics(statistics);
     providerUtils.insertWaypoint(waypoint1);
     Waypoint waypoint2 = new Waypoint();
     waypoint2.setDescription(Long.toString(trackId));
     waypoint2.setTrackId(trackId);
-    waypoint2.setType(Waypoint.TYPE_STATISTICS);
+    waypoint2.setType(WaypointType.STATISTICS);
     waypoint2.setTripStatistics(statistics);
     providerUtils.insertWaypoint(waypoint2);
   
@@ -541,7 +542,7 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
   }
 
   /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#getNextWaypointNumber(long, boolean)}.
+   * Tests the method {@link MyTracksProviderUtilsImpl#getNextWaypointNumber(long, WaypointType)}.
    */
   public void testGetNextWaypointNumber() {
     long trackId = System.currentTimeMillis();
@@ -549,29 +550,29 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     providerUtils.insertTrack(track);
     
     Waypoint waypoint1 = new Waypoint();
-    waypoint1.setType(Waypoint.TYPE_STATISTICS);
+    waypoint1.setType(WaypointType.STATISTICS);
     waypoint1.setTrackId(trackId);
     Waypoint waypoint2 = new Waypoint();
-    waypoint2.setType(Waypoint.TYPE_WAYPOINT);
+    waypoint2.setType(WaypointType.WAYPOINT);
     waypoint2.setTrackId(trackId);
     Waypoint waypoint3 = new Waypoint();
-    waypoint3.setType(Waypoint.TYPE_STATISTICS);
+    waypoint3.setType(WaypointType.STATISTICS);
     waypoint3.setTrackId(trackId);
     Waypoint waypoint4 = new Waypoint();
-    waypoint4.setType(Waypoint.TYPE_WAYPOINT);
+    waypoint4.setType(WaypointType.WAYPOINT);
     waypoint4.setTrackId(trackId);
     providerUtils.insertWaypoint(waypoint1);
     providerUtils.insertWaypoint(waypoint2);
     providerUtils.insertWaypoint(waypoint3);
     providerUtils.insertWaypoint(waypoint4);
     
-    assertEquals(2, providerUtils.getNextWaypointNumber(trackId, true));
-    assertEquals(3, providerUtils.getNextWaypointNumber(trackId, false));
+    assertEquals(2, providerUtils.getNextWaypointNumber(trackId, WaypointType.STATISTICS));
+    assertEquals(3, providerUtils.getNextWaypointNumber(trackId, WaypointType.WAYPOINT));
   }
 
   /**
    * Tests the method
-   * {@link MyTracksProviderUtils#getLastStatisticsWaypoint(long)}.
+   * {@link MyTracksProviderUtils#getLastWaypoint(long, WaypointType)}.
    */
   public void testGetLastStatisticsWaypoint() {
     long trackId = System.currentTimeMillis();
@@ -580,21 +581,21 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
 
     Waypoint waypoint1 = new Waypoint();
     waypoint1.setTrackId(trackId);
-    waypoint1.setType(Waypoint.TYPE_STATISTICS);
+    waypoint1.setType(WaypointType.STATISTICS);
     waypoint1.setDescription("Desc1");
     Waypoint waypoint2 = new Waypoint();
     waypoint2.setTrackId(trackId);
-    waypoint2.setType(Waypoint.TYPE_STATISTICS);
+    waypoint2.setType(WaypointType.STATISTICS);
     waypoint2.setDescription("Desc2");
     Waypoint waypoint3 = new Waypoint();
     waypoint3.setTrackId(trackId);
-    waypoint3.setType(Waypoint.TYPE_WAYPOINT);
+    waypoint3.setType(WaypointType.WAYPOINT);
     waypoint3.setDescription("Desc3");
     providerUtils.insertWaypoint(waypoint1);
     providerUtils.insertWaypoint(waypoint2);
     providerUtils.insertWaypoint(waypoint3);
 
-    assertEquals("Desc2", providerUtils.getLastStatisticsWaypoint(trackId).getDescription());
+    assertEquals("Desc2", providerUtils.getLastWaypoint(trackId, WaypointType.STATISTICS).getDescription());
   }
 
   /**

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

@@ -15,7 +15,7 @@
  */
 package com.google.android.apps.mytracks.content;
 
-import com.google.android.apps.mytracks.content.WaypointCreationRequest.WaypointType;
+import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
 
 import android.os.Parcel;
 import android.test.AndroidTestCase;

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

@@ -22,6 +22,8 @@ import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.TracksColumns;
+import com.google.android.apps.mytracks.content.Waypoint;
+import com.google.android.apps.mytracks.content.WaypointsColumns;
 import com.google.android.apps.mytracks.testing.TestingProviderUtilsFactory;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.testing.mocking.AndroidMock;
@@ -38,6 +40,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Locale;
 import java.util.SimpleTimeZone;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -69,13 +72,15 @@ public class GpxImporterTest extends AndroidTestCase {
   private static final String TRACK_TIME_3 = "2010-04-22T18:24:50.123";
 
   private static final SimpleDateFormat DATE_FORMAT_0 = new SimpleDateFormat(
-      "yyyy-MM-dd'T'hh:mm:ss'Z'");
+      "yyyy-MM-dd'T'hh:mm:ss'Z'", Locale.US);
   private static final SimpleDateFormat DATE_FORMAT_1 = new SimpleDateFormat(
-      "yyyy-MM-dd'T'HH:mm:ss.SSS");
+      "yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US);
 
   static {
-    // We can't omit the timezones in the test, otherwise it'll use the local
-    // timezone and fail depending on where the test runner is.
+    /*
+     * We can't omit the timezones in the test, otherwise it'll use the local
+     * timezone and fail depending on where the test runner is.
+     */
     SimpleTimeZone utc = new SimpleTimeZone(0, "UTC");
     DATE_FORMAT_0.setTimeZone(utc);
     DATE_FORMAT_1.setTimeZone(utc);
@@ -134,11 +139,14 @@ public class GpxImporterTest extends AndroidTestCase {
   private static final long TRACK_POINT_ID_0 = 1;
   private static final long TRACK_POINT_ID_1 = 2;
   private static final long TRACK_POINT_ID_3 = 4;
+  private static final long WAYPOINT_ID_0 = 1;
 
   private static final Uri TRACK_ID_0_URI = ContentUris.appendId(
       TracksColumns.CONTENT_URI.buildUpon(), TRACK_ID_0).build();
   private static final Uri TRACK_ID_1_URI = ContentUris.appendId(
       TracksColumns.CONTENT_URI.buildUpon(), TRACK_ID_1).build();
+  private static final Uri WAYPOINT_ID_O_URI = ContentUris.appendId(
+      WaypointsColumns.CONTENT_URI.buildUpon(), WAYPOINT_ID_0).build();
 
   private MyTracksProviderUtils myTracksProviderUtils;
 
@@ -171,24 +179,19 @@ public class GpxImporterTest extends AndroidTestCase {
 
     expect(myTracksProviderUtils.insertTrack((Track) AndroidMock.anyObject()))
         .andReturn(TRACK_ID_0_URI);
-
-    // A flush happens before getting the start point ID
-    expect(myTracksProviderUtils.bulkInsertTrackPoint(
-        LocationsMatcher.eqLoc(location0), eq(1), eq(TRACK_ID_0))).andReturn(1);
-    expect(myTracksProviderUtils.getFirstTrackPointId(TRACK_ID_0)).andReturn(TRACK_POINT_ID_0);
+    expectFirstTrackPoint(location0, TRACK_ID_0, TRACK_POINT_ID_0);
 
     // A flush happens at the end
     expect(myTracksProviderUtils.bulkInsertTrackPoint(
         LocationsMatcher.eqLoc(location1), eq(1), eq(TRACK_ID_0))).andReturn(1);
     expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID_0)).andReturn(TRACK_POINT_ID_1);
 
-    myTracksProviderUtils.updateTrack(AndroidMock.capture(track));
-
+    expectUpdateTrack(track, true, TRACK_ID_0);
     AndroidMock.replay(myTracksProviderUtils);
 
     InputStream inputStream = new ByteArrayInputStream(VALID_ONE_TRACK_ONE_SEGMENT_GPX.getBytes());
-    long[] trackIds = GpxImporter.importGPXFile(
-        inputStream, myTracksProviderUtils, PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+    long[] trackIds = GpxImporter.importGPXFile(getContext(), inputStream, myTracksProviderUtils,
+        PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
     assertEquals(1, trackIds.length);
     assertEquals(TRACK_ID_0, trackIds[0]);
 
@@ -209,23 +212,19 @@ public class GpxImporterTest extends AndroidTestCase {
 
     expect(myTracksProviderUtils.insertTrack((Track) AndroidMock.anyObject()))
         .andReturn(TRACK_ID_0_URI);
-    // A flush happens before getting the start point ID
-    expect(myTracksProviderUtils.bulkInsertTrackPoint(
-        LocationsMatcher.eqLoc(location0), eq(1), eq(TRACK_ID_0))).andReturn(1);
-    expect(myTracksProviderUtils.getFirstTrackPointId(TRACK_ID_0)).andReturn(TRACK_POINT_ID_0);
+    expectFirstTrackPoint(location0, TRACK_ID_0, TRACK_POINT_ID_0);
 
     // A flush happens at the end
     expect(myTracksProviderUtils.bulkInsertTrackPoint(
         (Location[]) AndroidMock.anyObject(), eq(5), eq(TRACK_ID_0))).andStubReturn(5);
     expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID_0)).andReturn(TRACK_POINT_ID_3);
 
-    myTracksProviderUtils.updateTrack(AndroidMock.capture(track));
-
+    expectUpdateTrack(track, true, TRACK_ID_0);
     AndroidMock.replay(myTracksProviderUtils);
 
     InputStream inputStream = new ByteArrayInputStream(VALID_ONE_TRACK_TWO_SEGMENTS_GPX.getBytes());
-    long[] trackIds = GpxImporter.importGPXFile(
-        inputStream, myTracksProviderUtils, PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+    long[] trackIds = GpxImporter.importGPXFile(getContext(), inputStream, myTracksProviderUtils,
+        PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
     assertEquals(1, trackIds.length);
     assertEquals(TRACK_ID_0, trackIds[0]);
 
@@ -245,35 +244,31 @@ public class GpxImporterTest extends AndroidTestCase {
    * Tests one track with two segments, but no time in the track points.
    */
   public void testOneTrackTwoSegmentsNoTime() throws Exception {
-    Capture<Track> capturedTrack = new Capture<Track>();
+    Capture<Track> track = new Capture<Track>();
 
     expect(myTracksProviderUtils.insertTrack((Track) AndroidMock.anyObject()))
         .andReturn(TRACK_ID_0_URI);
-    // A flush happens before getting the start point ID
-    expect(myTracksProviderUtils.bulkInsertTrackPoint(
-      (Location[]) AndroidMock.anyObject(), eq(1), eq(TRACK_ID_0))).andReturn(1);
-    expect(myTracksProviderUtils.getFirstTrackPointId(TRACK_ID_0)).andReturn(TRACK_POINT_ID_0);
+    expectFirstTrackPoint(null, TRACK_ID_0, TRACK_POINT_ID_0);
 
     // A flush happens at the end
     expect(myTracksProviderUtils.bulkInsertTrackPoint(
         (Location[]) AndroidMock.anyObject(), eq(5), eq(TRACK_ID_0))).andStubReturn(5);
     expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID_0)).andReturn(TRACK_POINT_ID_3);
 
-    myTracksProviderUtils.updateTrack(AndroidMock.capture(capturedTrack));
-
+    expectUpdateTrack(track, true, TRACK_ID_0);
     AndroidMock.replay(myTracksProviderUtils);
 
     InputStream inputStream = new ByteArrayInputStream(
         VALID_ONE_TRACK_TWO_SEGMENTS_NO_TIME_GPX.getBytes());
-    long[] trackIds = GpxImporter.importGPXFile(
-        inputStream, myTracksProviderUtils, PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+    long[] trackIds = GpxImporter.importGPXFile(getContext(), inputStream, myTracksProviderUtils,
+        PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
     assertEquals(1, trackIds.length);
     assertEquals(TRACK_ID_0, trackIds[0]);
 
-    assertEquals(0, capturedTrack.getValue().getTripStatistics().getTotalTime());
+    assertEquals(0, track.getValue().getTripStatistics().getTotalTime());
 
     AndroidMock.verify(myTracksProviderUtils);
-    verifyTrack(capturedTrack.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, -1L);
+    verifyTrack(track.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, -1L);
   }
 
   /**
@@ -288,27 +283,19 @@ public class GpxImporterTest extends AndroidTestCase {
 
     expect(myTracksProviderUtils.insertTrack((Track) AndroidMock.anyObject()))
         .andReturn(TRACK_ID_0_URI);
-    // A flush happens before getting the start point ID
-    expect(myTracksProviderUtils.bulkInsertTrackPoint(
-        LocationsMatcher.eqLoc(location0), eq(1), eq(TRACK_ID_0))).andReturn(1);
-    expect(myTracksProviderUtils.getFirstTrackPointId(TRACK_ID_0)).andReturn(TRACK_POINT_ID_0);
-    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID_0)).andReturn(TRACK_POINT_ID_0);
-    myTracksProviderUtils.updateTrack(AndroidMock.capture(track0));
+    expectFirstTrackPoint(location0, TRACK_ID_0, TRACK_POINT_ID_0);
+    expectUpdateTrack(track0, false, TRACK_ID_0);
 
     expect(myTracksProviderUtils.insertTrack((Track) AndroidMock.anyObject()))
         .andReturn(TRACK_ID_1_URI);
-    // A flush happens before getting the start point ID
-    expect(myTracksProviderUtils.bulkInsertTrackPoint(
-        LocationsMatcher.eqLoc(location1), eq(1), eq(TRACK_ID_1))).andReturn(1);
-    expect(myTracksProviderUtils.getFirstTrackPointId(TRACK_ID_1)).andReturn(TRACK_POINT_ID_1);
-    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID_1)).andReturn(TRACK_POINT_ID_1);
-    myTracksProviderUtils.updateTrack(AndroidMock.capture(track1));
+    expectFirstTrackPoint(location1, TRACK_ID_1, TRACK_POINT_ID_1);
+    expectUpdateTrack(track1, true, TRACK_ID_1);
 
     AndroidMock.replay(myTracksProviderUtils);
 
     InputStream inputStream = new ByteArrayInputStream(VALID_TWO_TRACKS_GPX.getBytes());
-    long[] trackIds = GpxImporter.importGPXFile(
-        inputStream, myTracksProviderUtils, PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+    long[] trackIds = GpxImporter.importGPXFile(getContext(), inputStream, myTracksProviderUtils,
+        PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
     assertEquals(2, trackIds.length);
     assertEquals(TRACK_ID_0, trackIds[0]);
     assertEquals(TRACK_ID_1, trackIds[1]);
@@ -316,25 +303,6 @@ public class GpxImporterTest extends AndroidTestCase {
     AndroidMock.verify(myTracksProviderUtils);
   }
 
-  private Location createLocation(int index, long time) {
-    Location location = new Location(LocationManager.GPS_PROVIDER);
-    location.setLatitude(TRACK_LATITUDE + index);
-    location.setLongitude(TRACK_LONGITUDE + index);
-    location.setAltitude(TRACK_ELEVATION + index);
-    location.setTime(time);
-    return location;
-  }
-
-  private void verifyTrack(Track track, String name, String description, long time) {
-    assertEquals(name, track.getName());
-    assertEquals(description, track.getDescription());
-    if (time != -1L) {
-      assertEquals(time, track.getTripStatistics().getStartTime());
-    }
-    assertNotSame(-1, track.getStartId());
-    assertNotSame(-1, track.getStopId());
-  }
-
   /**
    * Test an invalid xml input.
    */
@@ -380,23 +348,78 @@ public class GpxImporterTest extends AndroidTestCase {
   private void testInvalidGpx(String xml) throws ParserConfigurationException, IOException {
     expect(myTracksProviderUtils.insertTrack((Track) AndroidMock.anyObject()))
         .andReturn(TRACK_ID_0_URI);
+
+    // For the following, use StubReturn since we don't care whether they are
+    // invoked or not.
     expect(myTracksProviderUtils.bulkInsertTrackPoint(
         (Location[]) AndroidMock.anyObject(), AndroidMock.anyInt(), AndroidMock.anyLong()))
         .andStubReturn(1);
     expect(myTracksProviderUtils.getFirstTrackPointId(TRACK_ID_0)).andStubReturn(TRACK_POINT_ID_0);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID_0)).andStubReturn(TRACK_POINT_ID_0);
     myTracksProviderUtils.deleteTrack(TRACK_ID_0);
     AndroidMock.replay(myTracksProviderUtils);
 
     InputStream inputStream = new ByteArrayInputStream(xml.getBytes());
     try {
-      GpxImporter.importGPXFile(
-          inputStream, myTracksProviderUtils, PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+      GpxImporter.importGPXFile(getContext(), inputStream, myTracksProviderUtils,
+          PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
     } catch (SAXException e) {
       // expected
     }
     AndroidMock.verify(myTracksProviderUtils);
   }
 
+  private Location createLocation(int index, long time) {
+    Location location = new Location(LocationManager.GPS_PROVIDER);
+    location.setLatitude(TRACK_LATITUDE + index);
+    location.setLongitude(TRACK_LONGITUDE + index);
+    location.setAltitude(TRACK_ELEVATION + index);
+    location.setTime(time);
+    return location;
+  }
+
+  /**
+   * Expects the first track point to be added.
+   * 
+   * @param location the location
+   * @param trackId the track id
+   * @param trackPointId the track point id
+   */
+  private void expectFirstTrackPoint(Location location, long trackId, long trackPointId) {
+    expect(myTracksProviderUtils.bulkInsertTrackPoint(
+        location != null ? LocationsMatcher.eqLoc(location) : (Location[]) AndroidMock.anyObject(),
+        eq(1), eq(trackId))).andReturn(1);
+    expect(myTracksProviderUtils.getFirstTrackPointId(trackId)).andReturn(trackPointId);
+    expect(myTracksProviderUtils.getLastTrackPointId(trackId)).andReturn(trackPointId);
+  }
+
+  /**
+   * Expects the track to be updated.
+   * 
+   * @param track the track
+   * @param lastTrack true if it is the last track in the gpx
+   * @param trackId the track id
+   */
+  private void expectUpdateTrack(Capture<Track> track, boolean lastTrack, long trackId) {
+    myTracksProviderUtils.updateTrack(AndroidMock.capture(track));
+    expect(myTracksProviderUtils.insertWaypoint((Waypoint) AndroidMock.anyObject()))
+        .andReturn(WAYPOINT_ID_O_URI);
+    if (lastTrack) {
+      // Return null to not add waypoints
+      expect(myTracksProviderUtils.getTrack(trackId)).andReturn(null);
+    }
+  }
+
+  private void verifyTrack(Track track, String name, String description, long time) {
+    assertEquals(name, track.getName());
+    assertEquals(description, track.getDescription());
+    if (time != -1L) {
+      assertEquals(time, track.getTripStatistics().getStartTime());
+    }
+    assertNotSame(-1, track.getStartId());
+    assertNotSame(-1, track.getStopId());
+  }
+
   /**
    * Workaround because of capture bug 2617107 in easymock:
    * http://sourceforge.net

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

@@ -61,12 +61,11 @@ public class KmlTrackWriterTest extends TrackFormatWriterTest {
     Element kmlTag = getChildElement(doc, "kml");
     Element docTag = getChildElement(kmlTag, "Document");
     assertEquals(TRACK_NAME, getChildTextValue(docTag, "name"));
-    assertEquals(TRACK_DESCRIPTION, getChildTextValue(docTag, "description"));
 
     // There are 3 placemarks - start, track, and end
     List<Element> placemarkTags = getChildElements(docTag, "Placemark", 3);
     assertTagIsPlacemark(
-        placemarkTags.get(0), TRACK_NAME + " (Start)", TRACK_DESCRIPTION, location1);
+        placemarkTags.get(0), TRACK_NAME + " (Start)", "", location1);
     assertTagIsPlacemark(
         placemarkTags.get(2), TRACK_NAME + " (End)", FULL_TRACK_DESCRIPTION, location4);
 
@@ -97,7 +96,9 @@ public class KmlTrackWriterTest extends TrackFormatWriterTest {
   private void assertTagIsPlacemark(
       Element tag, String name, String description, Location location) {
     assertEquals(name, getChildTextValue(tag, "name"));
-    assertEquals(description, getChildTextValue(tag, "description"));
+    if (description != null && !description.equals("")) {
+      assertEquals(description, getChildTextValue(tag, "description"));
+    }
     Element pointTag = getChildElement(tag, "Point");
     String expected = location.getLongitude() + "," + location.getLatitude() + ","
         + location.getAltitude();

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

@@ -22,6 +22,7 @@ import com.google.android.apps.mytracks.content.MyTracksProvider;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
+import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
 import com.google.android.apps.mytracks.content.WaypointCreationRequest;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.ApiAdapterFactory;
@@ -532,7 +533,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
     Waypoint wpt = providerUtils.getWaypoint(2);
     assertEquals(getContext().getString(R.string.marker_statistics_icon_url), wpt.getIcon());
     assertEquals(getContext().getString(R.string.marker_split_name_format, 1), wpt.getName());
-    assertEquals(Waypoint.TYPE_STATISTICS, wpt.getType());
+    assertEquals(WaypointType.STATISTICS, wpt.getType());
     assertEquals(123L, wpt.getTrackId());
     assertEquals(0.0, wpt.getLength());
     assertNotNull(wpt.getLocation());
@@ -564,7 +565,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
     assertEquals(getContext().getString(R.string.marker_waypoint_icon_url),
         wpt.getIcon());
     assertEquals(getContext().getString(R.string.marker_name_format, 1), wpt.getName());
-    assertEquals(Waypoint.TYPE_WAYPOINT, wpt.getType());
+    assertEquals(WaypointType.WAYPOINT, wpt.getType());
     assertEquals(123L, wpt.getTrackId());
     assertEquals(0.0, wpt.getLength());
     assertNotNull(wpt.getLocation());