Merging to head.

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

@@ -10,7 +10,7 @@ import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory;
 import com.google.android.apps.mytracks.io.file.TrackFormatWriter;
-import com.google.android.apps.mytracks.io.file.TrackWriter;
+import com.google.android.apps.mytracks.io.file.TrackWriterImpl;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext;
 import com.google.android.apps.mytracks.testing.TestingProviderUtilsFactory;
 
@@ -35,10 +35,10 @@ import org.easymock.IMocksControl;
  */
 public class TrackWriterTest extends AndroidTestCase {
   /**
-   * {@link TrackWriter} subclass which mocks out methods called from
-   * {@link TrackWriter#openFile}.
+   * {@link TrackWriterImpl} subclass which mocks out methods called from
+   * {@link TrackWriterImpl#openFile}.
    */
-  private static final class OpenFileTrackWriter extends TrackWriter {
+  private static final class OpenFileTrackWriter extends TrackWriterImpl {
     private final ByteArrayOutputStream stream;
     private final boolean canWrite;
 
@@ -46,9 +46,9 @@ public class TrackWriterTest extends AndroidTestCase {
      * Constructor.
      *
      * @param stream the stream to return from
-     *        {@link TrackWriter#newOutputStream}, or null to throw a
+     *        {@link TrackWriterImpl#newOutputStream}, or null to throw a
      *        {@link FileNotFoundException}
-     * @param canWrite the value that {@link TrackWriter#canWriteFile} will
+     * @param canWrite the value that {@link TrackWriterImpl#canWriteFile} will
      *        return
      */
     private OpenFileTrackWriter(Context context,
@@ -80,16 +80,16 @@ public class TrackWriterTest extends AndroidTestCase {
   }
 
   /**
-   * {@link TrackWriter} subclass which mocks out methods called from
-   * {@link TrackWriter#writeTrack}.
+   * {@link TrackWriterImpl} subclass which mocks out methods called from
+   * {@link TrackWriterImpl#writeTrack}.
    */
-  private final class WriteTracksTrackWriter extends TrackWriter {
+  private final class WriteTracksTrackWriter extends TrackWriterImpl {
     private final boolean openResult;
 
     /**
      * Constructor.
      *
-     * @param openResult the return value for {@link TrackWriter#openFile}
+     * @param openResult the return value for {@link TrackWriterImpl#openFile}
      */
     private WriteTracksTrackWriter(Context context,
         MyTracksProviderUtils providerUtils, Track track,
@@ -123,7 +123,7 @@ public class TrackWriterTest extends AndroidTestCase {
 
   private Track track;
   private TrackFormatWriter formatWriter;
-  private TrackWriter writer;
+  private TrackWriterImpl writer;
   private IMocksControl mocksControl;
   private MyTracksProviderUtils providerUtils;
   private Factory oldProviderUtilsFactory;
@@ -228,7 +228,7 @@ public class TrackWriterTest extends AndroidTestCase {
   }
 
   public void testWriteDocument_emptyTrack() {
-    writer = new TrackWriter(getContext(), providerUtils, track, formatWriter);
+    writer = new TrackWriterImpl(getContext(), providerUtils, track, formatWriter);
 
     // Set expected mock behavior
     formatWriter.writeHeader();
@@ -243,7 +243,7 @@ public class TrackWriterTest extends AndroidTestCase {
   }
 
   public void testWriteDocument() {
-    writer = new TrackWriter(getContext(), providerUtils, track, formatWriter);
+    writer = new TrackWriterImpl(getContext(), providerUtils, track, formatWriter);
 
     final Location[] locs = {
         new Location("fake0"),

MyTracksTest/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerFactoryTest.java

@@ -13,8 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services;
+package com.google.android.apps.mytracks.services.tasks;
 
+import com.google.android.apps.mytracks.services.tasks.PeriodicTask;
+import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerFactory;
+import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerTask;
 import com.google.android.apps.mytracks.util.ApiFeatures;
 
 import android.media.AudioManager;
@@ -55,7 +58,7 @@ public class StatusAnnouncerFactoryTest extends AndroidTestCase {
 
   public void testCreate() {
     apiFeatures.setHasTextToSpeech(true);
-    StatusAnnouncerFactory factory =
+    PeriodicTaskFactory factory =
         new StatusAnnouncerFactory(apiFeatures);
     PeriodicTask task = factory.create(getContext());
     assertTrue(task instanceof StatusAnnouncerTask);
@@ -63,7 +66,7 @@ public class StatusAnnouncerFactoryTest extends AndroidTestCase {
 
   public void testCreate_notAvailable() {
     apiFeatures.setHasTextToSpeech(false);
-    StatusAnnouncerFactory factory =
+    PeriodicTaskFactory factory =
         new StatusAnnouncerFactory(apiFeatures);
     PeriodicTask task = factory.create(getContext());
     assertNull(task);

MyTracksTest/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTaskTest.java

@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services;
+package com.google.android.apps.mytracks.services.tasks;
 
 import static com.google.android.testing.mocking.AndroidMock.capture;
 import static com.google.android.testing.mocking.AndroidMock.eq;
 import static com.google.android.testing.mocking.AndroidMock.expect;
 import static com.google.android.testing.mocking.AndroidMock.same;
 
+import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerTask;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.testing.mocking.AndroidMock;