Merge heads

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

@@ -225,6 +225,8 @@ public class TrackWriterTest extends AndroidTestCase {
 
     // Set expected mock behavior
     formatWriter.writeHeader();
+    formatWriter.writeBeginTrack(null);
+    formatWriter.writeEndTrack(null);
     formatWriter.writeFooter();
     formatWriter.close();
 

MyTracksTest/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesUtilsTest.java

@@ -67,6 +67,7 @@ public class SendFusionTablesUtilsTest extends TestCase {
    */
   public void testGetMapUrl_valid_track() {
     Track track = new Track();
+    track.setNumberOfPoints(2);
     TripStatistics stats = new TripStatistics();
     stats.setBounds((int) 100.E6, (int) 10.E6, (int) 50.E6, (int) 5.E6);
     track.setTripStatistics(stats);