Rename methods in MyTracksProviderUtils.

No logic change

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

@@ -127,7 +127,8 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     long lastPointId = initializeTrack(trackId, numPoints);
     ((MyTracksProviderUtilsImpl) providerUtils).setDefaultCursorBatchSize(batchSize);
     List<Location> locations = new ArrayList<Location>(numPoints);
-    LocationIterator it = providerUtils.getLocationIterator(trackId, -1, descending, locationFactory);
+    LocationIterator it = providerUtils.getTrackPointLocationIterator(
+        trackId, -1, descending, locationFactory);
     try {
       while (it.hasNext()) {
         Location loc = it.next();
@@ -162,12 +163,12 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
       loc.setAltitude(i * 2.5);
       locations[i] = loc;
     }
-    providerUtils.bulkInsertTrackPoints(locations, numPoints, id);
+    providerUtils.bulkInsertTrackPoint(locations, numPoints, id);
     
     // Load all inserted locations. 
     long lastPointId = -1;
     int counter = 0;
-    LocationIterator it = providerUtils.getLocationIterator(id, -1, false,
+    LocationIterator it = providerUtils.getTrackPointLocationIterator(id, -1, false,
         MyTracksProviderUtils.DEFAULT_LOCATION_FACTORY);
     try {
       while (it.hasNext()) {
@@ -187,51 +188,36 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
   }
   
   /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#getAllTracks()}
+   * Tests the method {@link MyTracksProviderUtilsImpl#createTrack(Cursor)}.
    */
-  public void testGetAllTracks() {
-    int initialTrackNumber = providerUtils.getAllTracks().size();
+  @UsesMocks(Cursor.class)
+  public void testCreateTrack() {
+    Cursor cursorMock = AndroidMock.createNiceMock(Cursor.class);
+    int startColumnIndex = 1;
+    int columnIndex = startColumnIndex;
+    AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TracksColumns._ID))
+        .andReturn(columnIndex++);
+    AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TracksColumns.NAME)).andReturn(
+        columnIndex++);
+    columnIndex = startColumnIndex;
+    // Id
+    AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
+    // Name
+    AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
     long trackId = System.currentTimeMillis();
-    providerUtils.insertTrack(getTrack(trackId, 0));
-    List<Track> allTracks = providerUtils.getAllTracks();
-    assertEquals(initialTrackNumber + 1, allTracks.size());
-    assertEquals(trackId, allTracks.get(allTracks.size() - 1).getId());
-  }
-  
-  /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#getTrack(long)}
-   */
-  public void testGetTrack() {
-    long trackId = System.currentTimeMillis();
-    providerUtils.insertTrack(getTrack(trackId, 0));
-    assertNotNull(providerUtils.getTrack(trackId));
-  }
-  
-  /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#getLastTrack()}
-   */
-  public void testGetLastTrack() {
-    long trackId = System.currentTimeMillis();
-    providerUtils.insertTrack(getTrack(trackId, 0));
-    assertEquals(trackId, providerUtils.getLastTrack().getId());
+    columnIndex = startColumnIndex;
+    // Id
+    AndroidMock.expect(cursorMock.getLong(columnIndex++)).andReturn(trackId);
+    // Name
+    String name = NAME_PREFIX + Long.toString(trackId);
+    AndroidMock.expect(cursorMock.getString(columnIndex++)).andReturn(name);
+    AndroidMock.replay(cursorMock);
+    Track track = providerUtils.createTrack(cursorMock);
+    assertEquals(trackId, track.getId());
+    assertEquals(name, track.getName());
+    AndroidMock.verify(cursorMock);
   }
 
-  /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#updateTrack(Track)}
-   */
-  public void testUpdateTrack() {
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 0);
-    String nameOld = "name1";
-    String nameNew = "name2";
-    track.setName(nameOld);
-    providerUtils.insertTrack(track);
-    assertEquals(nameOld, providerUtils.getTrack(trackId).getName()); 
-    track.setName(nameNew);
-    providerUtils.updateTrack(track);
-    assertEquals(nameNew, providerUtils.getTrack(trackId).getName()); 
-  }
-  
   /**
    * Tests the method {@link MyTracksProviderUtilsImpl#deleteAllTracks()}
    */
@@ -265,7 +251,7 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
         null, WaypointsColumns._ID);
     assertEquals(0, waypointCursor.getCount());
   }
-  
+
   /**
    * Tests the method {@link MyTracksProviderUtilsImpl#deleteTrack(long)}.
    */
@@ -305,38 +291,238 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
         null, WaypointsColumns._ID);
     assertEquals(0, waypointCursor.getCount());
   }
+
+  /**
+   * Tests the method {@link MyTracksProviderUtilsImpl#getAllTracks()}
+   */
+  public void testGetAllTracks() {
+    int initialTrackNumber = providerUtils.getAllTracks().size();
+    long trackId = System.currentTimeMillis();
+    providerUtils.insertTrack(getTrack(trackId, 0));
+    List<Track> allTracks = providerUtils.getAllTracks();
+    assertEquals(initialTrackNumber + 1, allTracks.size());
+    assertEquals(trackId, allTracks.get(allTracks.size() - 1).getId());
+  }
   
   /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#createTrack(Cursor)}.
+   * Tests the method {@link MyTracksProviderUtilsImpl#getLastTrack()}
+   */
+  public void testGetLastTrack() {
+    long trackId = System.currentTimeMillis();
+    providerUtils.insertTrack(getTrack(trackId, 0));
+    assertEquals(trackId, providerUtils.getLastTrack().getId());
+  }
+
+  /**
+   * Tests the method {@link MyTracksProviderUtilsImpl#getTrack(long)}
+   */
+  public void testGetTrack() {
+    long trackId = System.currentTimeMillis();
+    providerUtils.insertTrack(getTrack(trackId, 0));
+    assertNotNull(providerUtils.getTrack(trackId));
+  }
+  
+  /**
+   * Tests the method {@link MyTracksProviderUtilsImpl#updateTrack(Track)}
+   */
+  public void testUpdateTrack() {
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 0);
+    String nameOld = "name1";
+    String nameNew = "name2";
+    track.setName(nameOld);
+    providerUtils.insertTrack(track);
+    assertEquals(nameOld, providerUtils.getTrack(trackId).getName()); 
+    track.setName(nameNew);
+    providerUtils.updateTrack(track);
+    assertEquals(nameNew, providerUtils.getTrack(trackId).getName()); 
+  }
+  
+  /**
+   * Tests the method {@link MyTracksProviderUtilsImpl#createContentValues(Waypoint)}.
+   */
+  public void testCreateContentValues_waypoint() {
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    providerUtils.insertTrack(track);
+    // Bottom
+    long startTime = 1000L;
+    // AverageSpeed
+    double minGrade = -20.11;
+    TripStatistics statistics = new TripStatistics();
+    statistics.setStartTime(startTime);
+    statistics.setStopTime(2500L);
+    statistics.setTotalTime(1500L);
+    statistics.setMovingTime(700L);
+    statistics.setTotalDistance(750.0);
+    statistics.setTotalElevationGain(50.0);
+    statistics.setMaxSpeed(60.0);
+    statistics.setMaxElevation(1250.0);
+    statistics.setMinElevation(1200.0);
+    statistics.setMaxGrade(15.0);
+    statistics.setMinGrade(minGrade);
+    statistics.setBounds(-10000, 20000, 30000, -40000);
+    // Insert at first.
+    Waypoint waypoint = new Waypoint();
+    waypoint.setDescription(TEST_DESC);
+    waypoint.setType(Waypoint.TYPE_STATISTICS);
+    waypoint.setTripStatistics(statistics);
+    
+    Location loc = new Location("test");
+    loc.setLatitude(22);
+    loc.setLongitude(22);
+    loc.setAccuracy((float) 1 / 100.0f);
+    loc.setAltitude(2.5);
+    waypoint.setLocation(loc);
+    providerUtils.insertWaypoint(waypoint);
+  
+    MyTracksProviderUtilsImpl myTracksProviderUtilsImpl = new MyTracksProviderUtilsImpl(
+        new MockContentResolver());
+    
+    long waypointId = System.currentTimeMillis();
+    waypoint.setId(waypointId);
+    ContentValues contentValues = myTracksProviderUtilsImpl.createContentValues(waypoint);
+    assertEquals(waypointId, contentValues.get(WaypointsColumns._ID));
+    assertEquals(22 * 1000000, contentValues.get(WaypointsColumns.LONGITUDE));
+    assertEquals(TEST_DESC, contentValues.get(WaypointsColumns.DESCRIPTION));
+    assertEquals(startTime, contentValues.get(WaypointsColumns.STARTTIME));
+    assertEquals(minGrade, contentValues.get(WaypointsColumns.MINGRADE));
+  }
+
+  /**
+   * Tests the method {@link MyTracksProviderUtilsImpl#createWaypoint(Cursor)}.
    */
   @UsesMocks(Cursor.class)
-  public void testCreateTrack() {
+  public void testCreateWaypoint() {
     Cursor cursorMock = AndroidMock.createNiceMock(Cursor.class);
     int startColumnIndex = 1;
     int columnIndex = startColumnIndex;
-    AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TracksColumns._ID))
+    AndroidMock.expect(cursorMock.getColumnIndexOrThrow(WaypointsColumns._ID))
         .andReturn(columnIndex++);
-    AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TracksColumns.NAME)).andReturn(
+    AndroidMock.expect(cursorMock.getColumnIndexOrThrow(WaypointsColumns.NAME)).andReturn(
+        columnIndex++);
+    AndroidMock.expect(cursorMock.getColumnIndexOrThrow(WaypointsColumns.TRACKID)).andReturn(
         columnIndex++);
     columnIndex = startColumnIndex;
     // Id
     AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
     // Name
     AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
-    long trackId = System.currentTimeMillis();
+    // trackIdIndex
+    AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
+    long id = System.currentTimeMillis();
     columnIndex = startColumnIndex;
     // Id
-    AndroidMock.expect(cursorMock.getLong(columnIndex++)).andReturn(trackId);
+    AndroidMock.expect(cursorMock.getLong(columnIndex++)).andReturn(id);
     // Name
-    String name = NAME_PREFIX + Long.toString(trackId);
+    String name = NAME_PREFIX + Long.toString(id);
     AndroidMock.expect(cursorMock.getString(columnIndex++)).andReturn(name);
+    // trackIdIndex
+    long trackId = 11L;
+    AndroidMock.expect(cursorMock.getLong(columnIndex++)).andReturn(trackId);
     AndroidMock.replay(cursorMock);
-    Track track = providerUtils.createTrack(cursorMock);
-    assertEquals(trackId, track.getId());
-    assertEquals(name, track.getName());
+    Waypoint waypoint = providerUtils.createWaypoint(cursorMock);
+    assertEquals(id, waypoint.getId());
+    assertEquals(name, waypoint.getName());
+    assertEquals(trackId, waypoint.getTrackId());
     AndroidMock.verify(cursorMock);
   }
 
+  /**
+   * Tests the method
+   * {@link MyTracksProviderUtilsImpl#deleteWaypoint(long, DescriptionGenerator)}
+   * when there is only one waypoint in the track.
+   */
+  public void testDeleteWaypoint_onlyOneWayPoint() {
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    providerUtils.insertTrack(track);
+  
+    // Insert at first.
+    Waypoint waypoint1 = new Waypoint();
+    waypoint1.setDescription(TEST_DESC);
+    waypoint1.setTrackId(trackId);
+    waypoint1.setType(Waypoint.TYPE_STATISTICS);
+    providerUtils.insertWaypoint(waypoint1);
+  
+    // Delete
+    DescriptionGenerator descriptionGenerator = new DescriptionGenerator() {
+  
+      @Override
+      public String generateWaypointDescription(TripStatistics tripStatistics) {
+        return MyTracksProviderUtilsImplTest.MOCK_DESC;
+      }
+  
+      @SuppressWarnings("hiding")
+      @Override
+      public String generateTrackDescription(Track track, Vector<Double> distances,
+          Vector<Double> elevations, boolean html) {
+        return null;
+      }
+    };
+    providerUtils.deleteWaypoint(1, descriptionGenerator);
+  
+    assertNull(providerUtils.getWaypoint(1));
+  }
+
+  /**
+   * Tests the method
+   * {@link MyTracksProviderUtilsImpl#deleteWaypoint(long, DescriptionGenerator)}
+   * when there is more than one waypoint in the track.
+   */
+  public void testDeleteWaypoint_hasNextWayPoint() {
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    providerUtils.insertTrack(track);
+  
+    TripStatistics statistics = new TripStatistics();
+    statistics.setStartTime(1000L);
+    statistics.setStopTime(2500L);
+    statistics.setTotalTime(1500L);
+    statistics.setMovingTime(700L);
+    statistics.setTotalDistance(750.0);
+    statistics.setTotalElevationGain(50.0);
+    statistics.setMaxSpeed(60.0);
+    statistics.setMaxElevation(1250.0);
+    statistics.setMinElevation(1200.0);
+    statistics.setMaxGrade(15.0);
+    statistics.setMinGrade(-25.0);
+    statistics.setBounds(-10000, 20000, 30000, -40000);
+    // Insert at first.
+    Waypoint waypoint1 = new Waypoint();
+    waypoint1.setDescription(Long.toString(trackId));
+    waypoint1.setTrackId(trackId);
+    waypoint1.setType(Waypoint.TYPE_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.setTripStatistics(statistics);
+    providerUtils.insertWaypoint(waypoint2);
+  
+    // Delete
+    DescriptionGenerator descriptionGenerator = new DescriptionGenerator() {
+      @Override
+      public String generateWaypointDescription(TripStatistics tripStatistics) {
+        return MyTracksProviderUtilsImplTest.MOCK_DESC;
+      }
+  
+      @SuppressWarnings("hiding")
+      @Override
+      public String generateTrackDescription(Track track, Vector<Double> distances,
+          Vector<Double> elevations, boolean html) {
+        return null;
+      }
+    };
+    providerUtils.deleteWaypoint(1, descriptionGenerator);
+  
+    assertNull(providerUtils.getWaypoint(1));
+    assertEquals(MyTracksProviderUtilsImplTest.MOCK_DESC, providerUtils.getWaypoint(2)
+        .getDescription());
+  }
+
   /**
    * Tests the method {@link MyTracksProviderUtilsImpl#getFirstWaypointId(long)}.
    */
@@ -356,6 +542,35 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     assertEquals(1L, providerUtils.getFirstWaypointId(trackId));
   }
 
+  /**
+   * Tests the method {@link MyTracksProviderUtilsImpl#getNextWaypointNumber(long, boolean)}.
+   */
+  public void testGetNextWaypointNumber() {
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    providerUtils.insertTrack(track);
+    
+    Waypoint waypoint1 = new Waypoint();
+    waypoint1.setType(Waypoint.TYPE_STATISTICS);
+    waypoint1.setTrackId(trackId);
+    Waypoint waypoint2 = new Waypoint();
+    waypoint2.setType(Waypoint.TYPE_WAYPOINT);
+    waypoint2.setTrackId(trackId);
+    Waypoint waypoint3 = new Waypoint();
+    waypoint3.setType(Waypoint.TYPE_STATISTICS);
+    waypoint3.setTrackId(trackId);
+    Waypoint waypoint4 = new Waypoint();
+    waypoint4.setType(Waypoint.TYPE_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));
+  }
+
   /**
    * Tests the method
    * {@link MyTracksProviderUtils#getLastStatisticsWaypoint(long)}.
@@ -384,35 +599,6 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     assertEquals("Desc2", providerUtils.getLastStatisticsWaypoint(trackId).getDescription());
   }
 
-  /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#getNextMarkerNumber(long, boolean)}.
-   */
-  public void testGetNextMarkerNumber() {
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    providerUtils.insertTrack(track);
-    
-    Waypoint waypoint1 = new Waypoint();
-    waypoint1.setType(Waypoint.TYPE_STATISTICS);
-    waypoint1.setTrackId(trackId);
-    Waypoint waypoint2 = new Waypoint();
-    waypoint2.setType(Waypoint.TYPE_WAYPOINT);
-    waypoint2.setTrackId(trackId);
-    Waypoint waypoint3 = new Waypoint();
-    waypoint3.setType(Waypoint.TYPE_STATISTICS);
-    waypoint3.setTrackId(trackId);
-    Waypoint waypoint4 = new Waypoint();
-    waypoint4.setType(Waypoint.TYPE_WAYPOINT);
-    waypoint4.setTrackId(trackId);
-    providerUtils.insertWaypoint(waypoint1);
-    providerUtils.insertWaypoint(waypoint2);
-    providerUtils.insertWaypoint(waypoint3);
-    providerUtils.insertWaypoint(waypoint4);
-    
-    assertEquals(2, providerUtils.getNextMarkerNumber(trackId, true));
-    assertEquals(3, providerUtils.getNextMarkerNumber(trackId, false));
-  }
-
   /**
    * Tests the method {@link MyTracksProviderUtilsImpl#insertWaypoint(Waypoint)} and
    * {@link MyTracksProviderUtilsImpl#getWaypoint(long)}.
@@ -452,339 +638,22 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
   
   /**
    * Tests the method
-   * {@link MyTracksProviderUtilsImpl#deleteWaypoint(long, DescriptionGenerator)}
-   * when there is only one waypoint in the track.
-   */
-  public void testDeleteWaypoint_onlyOneWayPoint() {
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    providerUtils.insertTrack(track);
-
-    // Insert at first.
-    Waypoint waypoint1 = new Waypoint();
-    waypoint1.setDescription(TEST_DESC);
-    waypoint1.setTrackId(trackId);
-    waypoint1.setType(Waypoint.TYPE_STATISTICS);
-    providerUtils.insertWaypoint(waypoint1);
-
-    // Delete
-    DescriptionGenerator descriptionGenerator = new DescriptionGenerator() {
-
-      @Override
-      public String generateWaypointDescription(TripStatistics tripStatistics) {
-        return MyTracksProviderUtilsImplTest.MOCK_DESC;
-      }
-
-      @SuppressWarnings("hiding")
-      @Override
-      public String generateTrackDescription(Track track, Vector<Double> distances,
-          Vector<Double> elevations, boolean html) {
-        return null;
-      }
-    };
-    providerUtils.deleteWaypoint(1, descriptionGenerator);
-
-    assertNull(providerUtils.getWaypoint(1));
-  }
-
-  /**
-   * Tests the method
-   * {@link MyTracksProviderUtilsImpl#deleteWaypoint(long, DescriptionGenerator)}
-   * when there is more than one waypoint in the track.
-   */
-  public void testDeleteWaypoint_hasNextWayPoint() {
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    providerUtils.insertTrack(track);
-
-    TripStatistics statistics = new TripStatistics();
-    statistics.setStartTime(1000L);
-    statistics.setStopTime(2500L);
-    statistics.setTotalTime(1500L);
-    statistics.setMovingTime(700L);
-    statistics.setTotalDistance(750.0);
-    statistics.setTotalElevationGain(50.0);
-    statistics.setMaxSpeed(60.0);
-    statistics.setMaxElevation(1250.0);
-    statistics.setMinElevation(1200.0);
-    statistics.setMaxGrade(15.0);
-    statistics.setMinGrade(-25.0);
-    statistics.setBounds(-10000, 20000, 30000, -40000);
-    // Insert at first.
-    Waypoint waypoint1 = new Waypoint();
-    waypoint1.setDescription(Long.toString(trackId));
-    waypoint1.setTrackId(trackId);
-    waypoint1.setType(Waypoint.TYPE_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.setTripStatistics(statistics);
-    providerUtils.insertWaypoint(waypoint2);
-
-    // Delete
-    DescriptionGenerator descriptionGenerator = new DescriptionGenerator() {
-      @Override
-      public String generateWaypointDescription(TripStatistics tripStatistics) {
-        return MyTracksProviderUtilsImplTest.MOCK_DESC;
-      }
-
-      @SuppressWarnings("hiding")
-      @Override
-      public String generateTrackDescription(Track track, Vector<Double> distances,
-          Vector<Double> elevations, boolean html) {
-        return null;
-      }
-    };
-    providerUtils.deleteWaypoint(1, descriptionGenerator);
-
-    assertNull(providerUtils.getWaypoint(1));
-    assertEquals(MyTracksProviderUtilsImplTest.MOCK_DESC, providerUtils.getWaypoint(2)
-        .getDescription());
-  }
-  
-  /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#createWaypoint(Cursor)}.
-   */
-  @UsesMocks(Cursor.class)
-  public void testCreateWaypoint() {
-    Cursor cursorMock = AndroidMock.createNiceMock(Cursor.class);
-    int startColumnIndex = 1;
-    int columnIndex = startColumnIndex;
-    AndroidMock.expect(cursorMock.getColumnIndexOrThrow(WaypointsColumns._ID))
-        .andReturn(columnIndex++);
-    AndroidMock.expect(cursorMock.getColumnIndexOrThrow(WaypointsColumns.NAME)).andReturn(
-        columnIndex++);
-    AndroidMock.expect(cursorMock.getColumnIndexOrThrow(WaypointsColumns.TRACKID)).andReturn(
-        columnIndex++);
-    columnIndex = startColumnIndex;
-    // Id
-    AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
-    // Name
-    AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
-    // trackIdIndex
-    AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
-    long id = System.currentTimeMillis();
-    columnIndex = startColumnIndex;
-    // Id
-    AndroidMock.expect(cursorMock.getLong(columnIndex++)).andReturn(id);
-    // Name
-    String name = NAME_PREFIX + Long.toString(id);
-    AndroidMock.expect(cursorMock.getString(columnIndex++)).andReturn(name);
-    // trackIdIndex
-    long trackId = 11L;
-    AndroidMock.expect(cursorMock.getLong(columnIndex++)).andReturn(trackId);
-    AndroidMock.replay(cursorMock);
-    Waypoint waypoint = providerUtils.createWaypoint(cursorMock);
-    assertEquals(id, waypoint.getId());
-    assertEquals(name, waypoint.getName());
-    assertEquals(trackId, waypoint.getTrackId());
-    AndroidMock.verify(cursorMock);
-  }
-  
-  /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#createContentValues(Waypoint)}.
-   */
-  public void testCreateContentValues_waypoint() {
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    providerUtils.insertTrack(track);
-    // Bottom
-    long startTime = 1000L;
-    // AverageSpeed
-    double minGrade = -20.11;
-    TripStatistics statistics = new TripStatistics();
-    statistics.setStartTime(startTime);
-    statistics.setStopTime(2500L);
-    statistics.setTotalTime(1500L);
-    statistics.setMovingTime(700L);
-    statistics.setTotalDistance(750.0);
-    statistics.setTotalElevationGain(50.0);
-    statistics.setMaxSpeed(60.0);
-    statistics.setMaxElevation(1250.0);
-    statistics.setMinElevation(1200.0);
-    statistics.setMaxGrade(15.0);
-    statistics.setMinGrade(minGrade);
-    statistics.setBounds(-10000, 20000, 30000, -40000);
-    // Insert at first.
-    Waypoint waypoint = new Waypoint();
-    waypoint.setDescription(TEST_DESC);
-    waypoint.setType(Waypoint.TYPE_STATISTICS);
-    waypoint.setTripStatistics(statistics);
-    
-    Location loc = new Location("test");
-    loc.setLatitude(22);
-    loc.setLongitude(22);
-    loc.setAccuracy((float) 1 / 100.0f);
-    loc.setAltitude(2.5);
-    waypoint.setLocation(loc);
-    providerUtils.insertWaypoint(waypoint);
-
-    MyTracksProviderUtilsImpl myTracksProviderUtilsImpl = new MyTracksProviderUtilsImpl(
-        new MockContentResolver());
-    
-    long waypointId = System.currentTimeMillis();
-    waypoint.setId(waypointId);
-    ContentValues contentValues = myTracksProviderUtilsImpl.createContentValues(waypoint);
-    assertEquals(waypointId, contentValues.get(WaypointsColumns._ID));
-    assertEquals(22 * 1000000, contentValues.get(WaypointsColumns.LONGITUDE));
-    assertEquals(TEST_DESC, contentValues.get(WaypointsColumns.DESCRIPTION));
-    assertEquals(startTime, contentValues.get(WaypointsColumns.STARTTIME));
-    assertEquals(minGrade, contentValues.get(WaypointsColumns.MINGRADE));
-  }
-
-  /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#getLastValidTrackLocation(long)}.
-   */
-  public void testGetLastValidTrackLocation() {
-    // Insert track, points at first.
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    insertTrackWithLocations(track);
-
-    Location lastLocation = providerUtils.getLastValidTrackLocation(trackId);
-    checkLocation(9, lastLocation);
-  }
-
-  /**
-   * Tests the method
-   * {@link MyTracksProviderUtilsImpl#getLocationsCursor(long, long, int, boolean)}
-   * in descending.
-   */
-  public void testGetLocationCursor_desc() {
-    // Insert track, points at first.
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    insertTrackWithLocations(track);
-
-    Cursor cursor = providerUtils.getLocationsCursor(trackId, 2L, 5, true);
-    assertEquals(2, cursor.getCount());
-  }
-  
-  /**
-   * Tests the method
-   * {@link MyTracksProviderUtilsImpl#getLocationsCursor(long, long, int, boolean)}
-   * in ascending.
-   */
-  public void testGetLocationCursor_asc() {
-    // Insert track, points at first.
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    insertTrackWithLocations(track);
-
-    Cursor cursor = providerUtils.getLocationsCursor(trackId, 2L, 5, false);
-    assertEquals(5, cursor.getCount());
-  }
-  
-  /**
-   * Tests the method
-   * {@link MyTracksProviderUtilsImpl#getLocationIterator(long, long, boolean, LocationFactory)}
-   * in descending.
-   */
-  public void testGeLocationIterator_desc() {
-    // Insert track, points at first.
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    insertTrackWithLocations(track);
-
-    long startTrackPointId = 2L;
-
-    LocationIterator locationIterator = providerUtils.getLocationIterator(trackId,
-        startTrackPointId, true, MyTracksProviderUtils.DEFAULT_LOCATION_FACTORY);
-    for (int i = 1; i >= 0; i--) {
-      assertTrue(locationIterator.hasNext());
-      Location location = locationIterator.next();
-      assertEquals(2 + (i - 1), locationIterator.getLocationId());
-      checkLocation(i, location);
-    }
-    assertFalse(locationIterator.hasNext());
-  }
-  
-  /**
-   * Tests the method
-   * {@link MyTracksProviderUtilsImpl#getLocationIterator(long, long, boolean, LocationFactory)}
-   * in ascending.
-   */
-  public void testGeLocationIterator_asc() {
-    // Insert track, point at first.
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    insertTrackWithLocations(track);
-
-    long startTrackPointId = 2L;
-
-    LocationIterator locationIterator = providerUtils.getLocationIterator(trackId,
-        startTrackPointId, false, MyTracksProviderUtils.DEFAULT_LOCATION_FACTORY);
-    
-    for (int i = 1; i < 10; i++) {
-      assertTrue(locationIterator.hasNext());
-      Location location = locationIterator.next();
-      assertEquals(2 + (i - 1), locationIterator.getLocationId());
-      checkLocation(i, location);
-    }
-    assertFalse(locationIterator.hasNext());
-  }
-
-  /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#getLastTrackLocationId(long)}.
-   */
-  public void testGetLastTrackLocationId() {
-    // Insert track, point at first.
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    insertTrackWithLocations(track);
-
-    assertEquals(10, providerUtils.getLastTrackLocationId(trackId));
-  }
-
-  /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#getLastTrackLocation(long)}.
-   */
-  public void testGetLastTrackLocation() {
-    // Insert track, point at first.
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    insertTrackWithLocations(track);
-    checkLocation(9, providerUtils.getLastTrackLocation(trackId));
-  }
-
-  /**
-   * Tests the method
-   * {@link MyTracksProviderUtilsImpl#insertTrackPoint(Location, long)}. This
-   * test also covers the method
-   * {@link MyTracksProviderUtilsImpl#createContentValues(Location, long)}.
-   */
-  @SuppressWarnings("javadoc")
-  public void testInsertTrackPoint() {
-    // Insert track, point at first.
-    long trackId = System.currentTimeMillis();
-    Track track = getTrack(trackId, 10);
-    insertTrackWithLocations(track);
-
-    providerUtils.insertTrackPoint(createLocation(22), trackId);
-    assertEquals(11, providerUtils.getLocationsCursor(trackId, 0, 1000, false).getCount());
-  }
-
-  /**
-   * Tests the method
-   * {@link MyTracksProviderUtilsImpl#bulkInsertTrackPoints(Location[], int, long)}
+   * {@link MyTracksProviderUtilsImpl#bulkInsertTrackPoint(Location[], int, long)}
    * . This test also covers the method
    * {@link MyTracksProviderUtilsImpl#createContentValues(Location, long)} and
    * the inner class {@link MyTracksProviderUtilsImpl.CachedTrackPointsIndexes}.
    */
   @SuppressWarnings("javadoc")
-  public void testBulkInsertTrackPoints() {
+  public void testBulkInsertTrackPoint() {
     // Insert track, point at first.
     long trackId = System.currentTimeMillis();
     Track track = getTrack(trackId, 10);
     insertTrackWithLocations(track);
-
-    providerUtils.bulkInsertTrackPoints(track.getLocations().toArray(new Location[0]), -1, trackId);
-    assertEquals(20, providerUtils.getLocationsCursor(trackId, 0, 1000, false).getCount());
-    providerUtils.bulkInsertTrackPoints(track.getLocations().toArray(new Location[0]), 8, trackId);
-    assertEquals(28, providerUtils.getLocationsCursor(trackId, 0, 1000, false).getCount());
+  
+    providerUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), -1, trackId);
+    assertEquals(20, providerUtils.getTrackPointCursor(trackId, 0, 1000, false).getCount());
+    providerUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), 8, trackId);
+    assertEquals(28, providerUtils.getTrackPointCursor(trackId, 0, 1000, false).getCount());
   }
 
   /**
@@ -797,9 +666,9 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
    */
   @SuppressWarnings("javadoc")
   @UsesMocks(Cursor.class)
-  public void testCreateLocation() {
+  public void testCreateTrackPoint() {
     Cursor cursorMock = AndroidMock.createNiceMock(Cursor.class);
-
+  
     // Set index.
     int index = 1;
     // Id
@@ -819,7 +688,7 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     // Sensor
     AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SENSOR)).andReturn(
         index++);
-
+  
     // Set return value of isNull().
     index = 2;
     // Longitude
@@ -832,7 +701,7 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     AndroidMock.expect(cursorMock.isNull(index++)).andReturn(false);
     // Sensor
     AndroidMock.expect(cursorMock.isNull(index++)).andReturn(false);
-
+  
     // Set return value of isNull().
     index = 2;
     // Longitude
@@ -850,9 +719,9 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     // Sensor
     byte[] sensor = "Sensor state".getBytes();
     AndroidMock.expect(cursorMock.getBlob(index++)).andReturn(sensor);
-
+  
     AndroidMock.replay(cursorMock);
-    Location location = providerUtils.createLocation(cursorMock);
+    Location location = providerUtils.createTrackPoint(cursorMock);
     assertEquals((double) longitude, location.getLongitude());
     assertEquals((double) latitude, location.getLatitude());
     assertEquals(time, location.getTime());
@@ -860,6 +729,138 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     AndroidMock.verify(cursorMock);
   }
 
+  /**
+   * Tests the method
+   * {@link MyTracksProviderUtilsImpl#insertTrackPoint(Location, long)}. This
+   * test also covers the method
+   * {@link MyTracksProviderUtilsImpl#createContentValues(Location, long)}.
+   */
+  @SuppressWarnings("javadoc")
+  public void testInsertTrackPoint() {
+    // Insert track, point at first.
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    insertTrackWithLocations(track);
+  
+    providerUtils.insertTrackPoint(createLocation(22), trackId);
+    assertEquals(11, providerUtils.getTrackPointCursor(trackId, 0, 1000, false).getCount());
+  }
+
+  /**
+   * Tests the method {@link MyTracksProviderUtilsImpl#getLastTrackPoint(long)}.
+   */
+  public void testGetLastTrackPoint() {
+    // Insert track, point at first.
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    insertTrackWithLocations(track);
+    checkLocation(9, providerUtils.getLastTrackPoint(trackId));
+  }
+
+  /**
+   * Tests the method {@link MyTracksProviderUtilsImpl#getLastTrackPointId(long)}.
+   */
+  public void testGetLastTrackPointId() {
+    // Insert track, point at first.
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    insertTrackWithLocations(track);
+  
+    assertEquals(10, providerUtils.getLastTrackPointId(trackId));
+  }
+
+  /**
+   * Tests the method {@link MyTracksProviderUtilsImpl#getLastValidTrackPoint(long)}.
+   */
+  public void testGetLastValidTrackPoint() {
+    // Insert track, points at first.
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    insertTrackWithLocations(track);
+
+    Location lastLocation = providerUtils.getLastValidTrackPoint(trackId);
+    checkLocation(9, lastLocation);
+  }
+
+  /**
+   * Tests the method
+   * {@link MyTracksProviderUtilsImpl#getTrackPointCursor(long, long, int, boolean)}
+   * in descending.
+   */
+  public void testGetTrackPointCursor_desc() {
+    // Insert track, points at first.
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    insertTrackWithLocations(track);
+
+    Cursor cursor = providerUtils.getTrackPointCursor(trackId, 2L, 5, true);
+    assertEquals(2, cursor.getCount());
+  }
+  
+  /**
+   * Tests the method
+   * {@link MyTracksProviderUtilsImpl#getTrackPointCursor(long, long, int, boolean)}
+   * in ascending.
+   */
+  public void testGetTrackPointCursor_asc() {
+    // Insert track, points at first.
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    insertTrackWithLocations(track);
+
+    Cursor cursor = providerUtils.getTrackPointCursor(trackId, 2L, 5, false);
+    assertEquals(5, cursor.getCount());
+  }
+  
+  /**
+   * Tests the method
+   * {@link MyTracksProviderUtilsImpl#getTrackPointLocationIterator(long, long, boolean, LocationFactory)}
+   * in descending.
+   */
+  public void testGetTrackPointLocationIterator_desc() {
+    // Insert track, points at first.
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    insertTrackWithLocations(track);
+
+    long startTrackPointId = 2L;
+
+    LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId,
+        startTrackPointId, true, MyTracksProviderUtils.DEFAULT_LOCATION_FACTORY);
+    for (int i = 1; i >= 0; i--) {
+      assertTrue(locationIterator.hasNext());
+      Location location = locationIterator.next();
+      assertEquals(2 + (i - 1), locationIterator.getLocationId());
+      checkLocation(i, location);
+    }
+    assertFalse(locationIterator.hasNext());
+  }
+  
+  /**
+   * Tests the method
+   * {@link MyTracksProviderUtilsImpl#getTrackPointLocationIterator(long, long, boolean, LocationFactory)}
+   * in ascending.
+   */
+  public void testGetTrackPointLocationIterator_asc() {
+    // Insert track, point at first.
+    long trackId = System.currentTimeMillis();
+    Track track = getTrack(trackId, 10);
+    insertTrackWithLocations(track);
+
+    long startTrackPointId = 2L;
+
+    LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId,
+        startTrackPointId, false, MyTracksProviderUtils.DEFAULT_LOCATION_FACTORY);
+    
+    for (int i = 1; i < 10; i++) {
+      assertTrue(locationIterator.hasNext());
+      Location location = locationIterator.next();
+      assertEquals(2 + (i - 1), locationIterator.getLocationId());
+      checkLocation(i, location);
+    }
+    assertFalse(locationIterator.hasNext());
+  }
+
   /**
    * Simulates a track which is used for testing.
    * 
@@ -914,7 +915,7 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
    */
   private void insertTrackWithLocations(Track track) {
     providerUtils.insertTrack(track);
-    providerUtils.bulkInsertTrackPoints(track.getLocations().toArray(new Location[0]), track
+    providerUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), track
         .getLocations().size(), track.getId());
   }
 }

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

@@ -203,7 +203,7 @@ public class TrackDataHubTest extends AndroidTestCase {
 
     // Register two listeners
     Capture<ContentObserver> contentObserverCapture = new Capture<ContentObserver>();
-    expect(myTracksProviderUtils.getWaypointsCursor(
+    expect(myTracksProviderUtils.getWaypointCursor(
         eq(TRACK_ID), AndroidMock.leq(0L), eq(Constants.MAX_DISPLAYED_WAYPOINTS_POINTS)))
         .andStubAnswer(new FixedSizeCursorAnswer(2));
     expect(myTracksProviderUtils.createWaypoint(isA(Cursor.class)))
@@ -230,7 +230,7 @@ public class TrackDataHubTest extends AndroidTestCase {
 
     // Cause waypoints table update
     ContentObserver contentObserver = contentObserverCapture.getValue();
-    expect(myTracksProviderUtils.getWaypointsCursor(
+    expect(myTracksProviderUtils.getWaypointCursor(
         eq(TRACK_ID), AndroidMock.leq(0L), eq(Constants.MAX_DISPLAYED_WAYPOINTS_POINTS)))
         .andStubAnswer(new FixedSizeCursorAnswer(3));
     expect(myTracksProviderUtils.createWaypoint(isA(Cursor.class)))
@@ -251,7 +251,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     verifyAndReset();
 
     // Unregister one listener
-    expect(myTracksProviderUtils.getWaypointsCursor(
+    expect(myTracksProviderUtils.getWaypointCursor(
         eq(TRACK_ID), AndroidMock.leq(0L), eq(Constants.MAX_DISPLAYED_WAYPOINTS_POINTS)))
         .andStubAnswer(new FixedSizeCursorAnswer(4));
     expect(myTracksProviderUtils.createWaypoint(isA(Cursor.class)))
@@ -288,9 +288,9 @@ public class TrackDataHubTest extends AndroidTestCase {
         eq(TrackPointsColumns.CONTENT_URI), capture(contentObserverCapture));
 
     FixedSizeLocationIterator locationIterator = new FixedSizeLocationIterator(1, 10, 5);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID), eq(0L), eq(false), isA(LocationFactory.class))).andReturn(locationIterator);
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID)).andReturn(10L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID)).andReturn(10L);
     trackDataListener1.clearTrackPoints();
     locationIterator.expectLocationsDelivered(trackDataListener1);
     trackDataListener1.onNewTrackPointsDone();
@@ -303,9 +303,9 @@ public class TrackDataHubTest extends AndroidTestCase {
 
     // Register a second listener
     locationIterator = new FixedSizeLocationIterator(1, 10, 5);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID), eq(0L), eq(false), isA(LocationFactory.class))).andReturn(locationIterator);
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID)).andReturn(10L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID)).andReturn(10L);
     trackDataListener2.clearTrackPoints();
     locationIterator.expectLocationsDelivered(trackDataListener2);
     trackDataListener2.onNewTrackPointsDone();
@@ -318,9 +318,9 @@ public class TrackDataHubTest extends AndroidTestCase {
     // Deliver more points - should go to both listeners without clearing
     ContentObserver contentObserver = contentObserverCapture.getValue();
     locationIterator = new FixedSizeLocationIterator(11, 10, 1);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID), eq(11L), eq(false), isA(LocationFactory.class))).andReturn(locationIterator);
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID)).andReturn(20L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID)).andReturn(20L);
     locationIterator.expectLocationsDelivered(trackDataListener1);
     locationIterator.expectLocationsDelivered(trackDataListener2);
     trackDataListener1.onNewTrackPointsDone();
@@ -332,10 +332,10 @@ public class TrackDataHubTest extends AndroidTestCase {
 
     // Unregister one listener and change track
     locationIterator = new FixedSizeLocationIterator(101, 10);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID + 1), eq(0L), eq(false), isA(LocationFactory.class)))
         .andReturn(locationIterator);
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID + 1)).andReturn(110L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID + 1)).andReturn(110L);
     trackDataListener2.clearTrackPoints();
     locationIterator.expectLocationsDelivered(trackDataListener2);
     trackDataListener2.onNewTrackPointsDone();
@@ -358,9 +358,9 @@ public class TrackDataHubTest extends AndroidTestCase {
         eq(TrackPointsColumns.CONTENT_URI), capture(contentObserverCapture));
 
     FixedSizeLocationIterator locationIterator = new FixedSizeLocationIterator(1, 10, 5);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID), eq(0L), eq(false), isA(LocationFactory.class))).andReturn(locationIterator);
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID)).andReturn(10L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID)).andReturn(10L);
 
     trackDataListener1.clearTrackPoints();
     locationIterator.expectLocationsDelivered(trackDataListener1);
@@ -384,9 +384,9 @@ public class TrackDataHubTest extends AndroidTestCase {
     dataSource.registerContentObserver(
         eq(TrackPointsColumns.CONTENT_URI), capture(contentObserverCapture));
     locationIterator = new FixedSizeLocationIterator(1, 10, 5);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID), eq(0L), eq(false), isA(LocationFactory.class))).andReturn(locationIterator);
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID)).andReturn(10L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID)).andReturn(10L);
     trackDataListener1.clearTrackPoints();
     locationIterator.expectLocationsDelivered(trackDataListener1);
     trackDataListener1.onNewTrackPointsDone();
@@ -409,9 +409,9 @@ public class TrackDataHubTest extends AndroidTestCase {
         eq(TrackPointsColumns.CONTENT_URI), capture(observerCapture));
 
     FixedSizeLocationIterator locationIterator = new FixedSizeLocationIterator(1, 10, 5);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID), eq(0L), eq(false), isA(LocationFactory.class))).andReturn(locationIterator);
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID)).andReturn(10L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID)).andReturn(10L);
     trackDataListener1.clearTrackPoints();
     locationIterator.expectLocationsDelivered(trackDataListener1);
     trackDataListener1.onNewTrackPointsDone();
@@ -434,10 +434,10 @@ public class TrackDataHubTest extends AndroidTestCase {
     dataSource.registerContentObserver(
         eq(TrackPointsColumns.CONTENT_URI), capture(observerCapture));
     locationIterator = new FixedSizeLocationIterator(1, 10);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID + 1), eq(0L), eq(false), isA(LocationFactory.class)))
         .andReturn(locationIterator);
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID + 1)).andReturn(10L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID + 1)).andReturn(10L);
     trackDataListener1.clearTrackPoints();
     locationIterator.expectLocationsDelivered(trackDataListener1);
     trackDataListener1.onNewTrackPointsDone();
@@ -458,15 +458,15 @@ public class TrackDataHubTest extends AndroidTestCase {
     dataSource.registerContentObserver(
         eq(TrackPointsColumns.CONTENT_URI), capture(contentObserverCapture));
 
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID)).andReturn(200L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID)).andReturn(200L);
     AndroidMock.expectLastCall().anyTimes();
     FixedSizeLocationIterator locationIterator1 = new FixedSizeLocationIterator(
         1, 200, 4, 25, 71, 120);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID), eq(0L), eq(false), isA(LocationFactory.class))).andReturn(locationIterator1);
     FixedSizeLocationIterator locationIterator2 = new FixedSizeLocationIterator(
         1, 200, 4, 25, 71, 120);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID), eq(0L), eq(false), isA(LocationFactory.class))).andReturn(locationIterator2);
 
     trackDataListener1.clearTrackPoints();
@@ -496,9 +496,9 @@ public class TrackDataHubTest extends AndroidTestCase {
 
     // Deliver 30 points (no sampling happens)
     FixedSizeLocationIterator locationIterator = new FixedSizeLocationIterator(1, 30, 5);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID), eq(0L), eq(false), isA(LocationFactory.class))).andReturn(locationIterator);
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID)).andReturn(30L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID)).andReturn(30L);
 
     trackDataListener1.clearTrackPoints();
     locationIterator.expectLocationsDelivered(trackDataListener1);
@@ -513,9 +513,9 @@ public class TrackDataHubTest extends AndroidTestCase {
     // Now deliver 30 more (incrementally sampled)
     ContentObserver observer = observerCapture.getValue();
     locationIterator = new FixedSizeLocationIterator(31, 30);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID), eq(31L), eq(false), isA(LocationFactory.class))).andReturn(locationIterator);
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID)).andReturn(60L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID)).andReturn(60L);
     locationIterator.expectSampledLocationsDelivered(trackDataListener1, 2, false);
     trackDataListener1.onNewTrackPointsDone();
     replay();
@@ -525,9 +525,9 @@ public class TrackDataHubTest extends AndroidTestCase {
 
     // Now another 30 (triggers resampling)
     locationIterator = new FixedSizeLocationIterator(1, 90);
-    expect(myTracksProviderUtils.getLocationIterator(
+    expect(myTracksProviderUtils.getTrackPointLocationIterator(
         eq(TRACK_ID), eq(0L), eq(false), isA(LocationFactory.class))).andReturn(locationIterator);
-    expect(myTracksProviderUtils.getLastTrackLocationId(TRACK_ID)).andReturn(90L);
+    expect(myTracksProviderUtils.getLastTrackPointId(TRACK_ID)).andReturn(90L);
     trackDataListener1.clearTrackPoints();
     locationIterator.expectSampledLocationsDelivered(trackDataListener1, 2, false);
     trackDataListener1.onNewTrackPointsDone();
@@ -840,7 +840,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
     Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
     dataSource.registerContentObserver(eq(WaypointsColumns.CONTENT_URI), capture(observerCapture));    
-    expect(myTracksProviderUtils.getWaypointsCursor(capture(new Capture<Long>()), capture(new Capture<Long>()),
+    expect(myTracksProviderUtils.getWaypointCursor(capture(new Capture<Long>()), capture(new Capture<Long>()),
         capture(new Capture<Integer>()))).andReturn(null);
     trackDataListener1.clearWaypoints();
     trackDataListener1.onNewWaypointsDone();

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

@@ -148,13 +148,13 @@ public class GpxImporterTest extends AndroidTestCase {
     expect(providerUtils.insertTrack(AndroidMock.capture(trackParam)))
         .andReturn(TRACK_ID_URI);
 
-    expect(providerUtils.getLastTrackLocationId(TRACK_ID)).andReturn(TRACK_POINT_ID_1).andReturn(TRACK_POINT_ID_2);
+    expect(providerUtils.getLastTrackPointId(TRACK_ID)).andReturn(TRACK_POINT_ID_1).andReturn(TRACK_POINT_ID_2);
 
     // A flush happens after the first insertion to get the starting point ID,
     // which is why we get two calls
-    expect(providerUtils.bulkInsertTrackPoints(LocationsMatcher.eqLoc(loc1),
+    expect(providerUtils.bulkInsertTrackPoint(LocationsMatcher.eqLoc(loc1),
         eq(1), eq(TRACK_ID))).andReturn(1);
-    expect(providerUtils.bulkInsertTrackPoints(LocationsMatcher.eqLoc(loc2),
+    expect(providerUtils.bulkInsertTrackPoint(LocationsMatcher.eqLoc(loc2),
         eq(1), eq(TRACK_ID))).andReturn(1);
 
     providerUtils.updateTrack(AndroidMock.capture(trackParam));
@@ -223,9 +223,9 @@ public class GpxImporterTest extends AndroidTestCase {
     expect(providerUtils.insertTrack((Track) AndroidMock.anyObject()))
         .andReturn(TRACK_ID_URI);
 
-    expect(providerUtils.bulkInsertTrackPoints((Location[]) AndroidMock.anyObject(),
+    expect(providerUtils.bulkInsertTrackPoint((Location[]) AndroidMock.anyObject(),
         AndroidMock.anyInt(), AndroidMock.anyLong())).andStubReturn(1);
-    expect(providerUtils.getLastTrackLocationId(TRACK_ID)).andStubReturn(TRACK_POINT_ID_1);
+    expect(providerUtils.getLastTrackPointId(TRACK_ID)).andStubReturn(TRACK_POINT_ID_1);
 
     providerUtils.deleteTrack(TRACK_ID);
 

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

@@ -256,7 +256,7 @@ public class TrackWriterTest extends AndroidTestCase {
     // Make location 3 invalid
     locs[2].setLatitude(100);
 
-    assertEquals(locs.length, providerUtils.bulkInsertTrackPoints(locs, locs.length, TRACK_ID));
+    assertEquals(locs.length, providerUtils.bulkInsertTrackPoint(locs, locs.length, TRACK_ID));
     for (int i = 0;  i < wps.length; ++i) {
       Waypoint wpt = wps[i];
       wpt.setTrackId(TRACK_ID);

MyTracksTest/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTaskTest.java

@@ -144,7 +144,7 @@ public class SendMapsAsyncTaskTest extends AndroidTestCase {
    */
   public void testUploadAllTrackPoints_nullCursor() {
     Track track = TrackStubUtils.createTrack(1);
-    AndroidMock.expect(myTracksProviderUtilsMock.getLocationsCursor(TRACK_ID, 0, -1, false))
+    AndroidMock.expect(myTracksProviderUtilsMock.getTrackPointCursor(TRACK_ID, 0, -1, false))
         .andReturn(null);
     AndroidMock.replay(sendMapsActivityMock, myTracksProviderUtilsMock);
     SendMapsAsyncTask sendMapsAsyncTask = new SendMapsAsyncTask(sendMapsActivityMock,
@@ -164,9 +164,9 @@ public class SendMapsAsyncTaskTest extends AndroidTestCase {
     AndroidMock.expect(cursorMock.getCount()).andReturn(2);
     AndroidMock.expect(cursorMock.moveToPosition(0)).andReturn(true);
     cursorMock.close();
-    AndroidMock.expect(myTracksProviderUtilsMock.createLocation(cursorMock)).andReturn(
+    AndroidMock.expect(myTracksProviderUtilsMock.createTrackPoint(cursorMock)).andReturn(
         new Location("1"));
-    AndroidMock.expect(myTracksProviderUtilsMock.getLocationsCursor(TRACK_ID, 0, -1, false))
+    AndroidMock.expect(myTracksProviderUtilsMock.getTrackPointCursor(TRACK_ID, 0, -1, false))
         .andReturn(cursorMock);
 
     AndroidMock.replay(sendMapsActivityMock, myTracksProviderUtilsMock, cursorMock);
@@ -191,9 +191,9 @@ public class SendMapsAsyncTaskTest extends AndroidTestCase {
     AndroidMock.expect(cursorMock.moveToPosition(0)).andReturn(true);
     AndroidMock.expect(cursorMock.moveToPosition(1)).andReturn(true);
     cursorMock.close();
-    AndroidMock.expect(myTracksProviderUtilsMock.createLocation(cursorMock))
+    AndroidMock.expect(myTracksProviderUtilsMock.createTrackPoint(cursorMock))
         .andReturn(new Location("1")).times(2);
-    AndroidMock.expect(myTracksProviderUtilsMock.getLocationsCursor(TRACK_ID, 0, -1, false))
+    AndroidMock.expect(myTracksProviderUtilsMock.getTrackPointCursor(TRACK_ID, 0, -1, false))
         .andReturn(cursorMock);
 
     AndroidMock.replay(sendMapsActivityMock, myTracksProviderUtilsMock, cursorMock);
@@ -221,9 +221,9 @@ public class SendMapsAsyncTaskTest extends AndroidTestCase {
     AndroidMock.expect(cursorMock.moveToPosition(0)).andReturn(true);
     AndroidMock.expect(cursorMock.moveToPosition(1)).andReturn(true);
     cursorMock.close();
-    AndroidMock.expect(myTracksProviderUtilsMock.createLocation(cursorMock))
+    AndroidMock.expect(myTracksProviderUtilsMock.createTrackPoint(cursorMock))
         .andReturn(new Location("1")).times(2);
-    AndroidMock.expect(myTracksProviderUtilsMock.getLocationsCursor(TRACK_ID, 0, -1, false))
+    AndroidMock.expect(myTracksProviderUtilsMock.getTrackPointCursor(TRACK_ID, 0, -1, false))
         .andReturn(cursorMock);
 
     AndroidMock.replay(sendMapsActivityMock, myTracksProviderUtilsMock, cursorMock);
@@ -250,9 +250,9 @@ public class SendMapsAsyncTaskTest extends AndroidTestCase {
     AndroidMock.expect(cursorMock.moveToPosition(0)).andReturn(true);
     AndroidMock.expect(cursorMock.moveToPosition(1)).andReturn(true);
     cursorMock.close();
-    AndroidMock.expect(myTracksProviderUtilsMock.createLocation(cursorMock))
+    AndroidMock.expect(myTracksProviderUtilsMock.createTrackPoint(cursorMock))
         .andReturn(new Location("1")).times(2);
-    AndroidMock.expect(myTracksProviderUtilsMock.getLocationsCursor(TRACK_ID, 0, -1, false))
+    AndroidMock.expect(myTracksProviderUtilsMock.getTrackPointCursor(TRACK_ID, 0, -1, false))
         .andReturn(cursorMock);
 
     AndroidMock.replay(sendMapsActivityMock, myTracksProviderUtilsMock, cursorMock);
@@ -274,7 +274,7 @@ public class SendMapsAsyncTaskTest extends AndroidTestCase {
   @UsesMocks(Cursor.class)
   public void testUploadWaypoints_nullCursor() {
     AndroidMock.expect(
-        myTracksProviderUtilsMock.getWaypointsCursor(TRACK_ID, 0,
+        myTracksProviderUtilsMock.getWaypointCursor(TRACK_ID, 0,
             Constants.MAX_LOADED_WAYPOINTS_POINTS)).andReturn(null);
     AndroidMock.replay(sendMapsActivityMock, myTracksProviderUtilsMock);
     SendMapsAsyncTask sendMapsAsyncTask = new SendMapsAsyncTask(sendMapsActivityMock,
@@ -296,7 +296,7 @@ public class SendMapsAsyncTaskTest extends AndroidTestCase {
     cursorMock.close();
 
     AndroidMock.expect(
-        myTracksProviderUtilsMock.getWaypointsCursor(TRACK_ID, 0,
+        myTracksProviderUtilsMock.getWaypointCursor(TRACK_ID, 0,
             Constants.MAX_LOADED_WAYPOINTS_POINTS)).andReturn(cursorMock);
 
     AndroidMock.replay(sendMapsActivityMock, myTracksProviderUtilsMock, cursorMock);
@@ -323,7 +323,7 @@ public class SendMapsAsyncTaskTest extends AndroidTestCase {
     cursorMock.close();
 
     AndroidMock.expect(
-        myTracksProviderUtilsMock.getWaypointsCursor(TRACK_ID, 0,
+        myTracksProviderUtilsMock.getWaypointCursor(TRACK_ID, 0,
             Constants.MAX_LOADED_WAYPOINTS_POINTS)).andReturn(cursorMock);
     Waypoint waypoint = new Waypoint();
     waypoint.setLocation(TrackStubUtils.createMyTracksLocation());