Removed 'mytracks' from documentation, code, and filenames.

src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderTest.java

@@ -36,16 +36,16 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class CustomContentProviderTest {
 
-  private static final String DATABASE_NAME = "mytrackstest.db";
+  private static final String DATABASE_NAME = "test.db";
 
   private SQLiteDatabase db;
-  private CustomContentProvider myTracksProvider;
+  private CustomContentProvider customContentProvider;
 
   @Before
   protected void setUp()  {
     InstrumentationRegistry.getInstrumentation().getContext().deleteDatabase(DATABASE_NAME);
     db = (new DatabaseHelper(InstrumentationRegistry.getInstrumentation().getContext(), DATABASE_NAME)).getWritableDatabase();
-    myTracksProvider = new CustomContentProvider();
+    customContentProvider = new CustomContentProvider();
   }
 
   /**
@@ -61,18 +61,18 @@ public class CustomContentProviderTest {
    * Tests {@link CustomContentProvider#onCreate(android.content.Context)}.
    */
   public void testOnCreate() {
-    Assert.assertTrue(myTracksProvider.onCreate(InstrumentationRegistry.getInstrumentation().getContext()));
+    Assert.assertTrue(customContentProvider.onCreate(InstrumentationRegistry.getInstrumentation().getContext()));
   }
 
   /**
    * Tests {@link CustomContentProvider#getType(Uri)}.
    */
   public void testGetType() {
-    Assert.assertEquals(TracksColumns.CONTENT_TYPE, myTracksProvider.getType(TracksColumns.CONTENT_URI));
+    Assert.assertEquals(TracksColumns.CONTENT_TYPE, customContentProvider.getType(TracksColumns.CONTENT_URI));
     Assert.assertEquals(
-        TrackPointsColumns.CONTENT_TYPE, myTracksProvider.getType(TrackPointsColumns.CONTENT_URI));
+        TrackPointsColumns.CONTENT_TYPE, customContentProvider.getType(TrackPointsColumns.CONTENT_URI));
     Assert.assertEquals(
-        WaypointsColumns.CONTENT_TYPE, myTracksProvider.getType(WaypointsColumns.CONTENT_URI));
+        WaypointsColumns.CONTENT_TYPE, customContentProvider.getType(WaypointsColumns.CONTENT_URI));
   }
 
   /**

src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderUtilsImplTest.java

@@ -381,12 +381,12 @@ public class CustomContentProviderUtilsImplTest {
     waypoint.setLocation(loc);
     providerUtils.insertWaypoint(waypoint);
   
-    ContentProviderUtilsImpl myTracksProviderUtilsImpl = new ContentProviderUtilsImpl(
+    ContentProviderUtilsImpl contentProviderUtils = new ContentProviderUtilsImpl(
         new MockContentResolver());
     
     long waypointId = System.currentTimeMillis();
     waypoint.setId(waypointId);
-    ContentValues contentValues = myTracksProviderUtilsImpl.createContentValues(waypoint);
+    ContentValues contentValues = contentProviderUtils.createContentValues(waypoint);
     Assert.assertEquals(waypointId, contentValues.get(WaypointsColumns._ID));
     Assert.assertEquals(22 * 1000000, contentValues.get(WaypointsColumns.LONGITUDE));
     Assert.assertEquals(TEST_DESC, contentValues.get(WaypointsColumns.DESCRIPTION));

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

@@ -52,7 +52,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Tests for the MyTracks track recording service.
+ * Tests for the track recording service.
  * <p>
  * TODO: The original class, ServiceTestCase, has a few limitations, e.g. it's
  * not possible to properly shutdown the service, unless tearDown() is called,
@@ -135,9 +135,9 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
     context = new MockContext(mockContentResolver, renamingDelegatingContext);
 
     // Set up the mock content resolver
-    CustomContentProvider myTracksProvider = new CustomContentProvider();
-    myTracksProvider.attachInfo(context, null);
-    mockContentResolver.addProvider(ContentProviderUtils.AUTHORITY, myTracksProvider);
+    CustomContentProvider customContentProvider = new CustomContentProvider();
+    customContentProvider.attachInfo(context, null);
+    mockContentResolver.addProvider(ContentProviderUtils.AUTHORITY, customContentProvider);
 
     MockContentProvider settingsProvider = new MockContentProvider(context) {
         @Override
@@ -341,7 +341,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
 
     @Override
     public void onReceive(Context ctx, Intent intent) {
-      Log.d("MyTracksTest", "Got broadcast: " + intent);
+      Log.d("Test", "Got broadcast: " + intent);
       synchronized (receivedIntents) {
         receivedIntents.add(intent);
         receivedIntents.notifyAll();