Merging to head.

MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java

@@ -28,6 +28,8 @@ import android.test.mock.MockContext;
 import android.test.mock.MockResources;
 
 import java.io.IOException;
+import java.text.DateFormat;
+import java.util.Date;
 
 import junit.framework.TestCase;
 
@@ -55,13 +57,13 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
     StringWritingDocsHelper docsHelper = new StringWritingDocsHelper();
     addTrackRow(docsHelper, false);
 
+    DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);    
     String expectedData =
       "<entry xmlns='http://www.w3.org/2005/Atom' "
       + "xmlns:gsx='http://schemas.google.com/spreadsheets/2006/extended'>"
       + "<gsx:name><![CDATA[trackName]]></gsx:name>"
       + "<gsx:description><![CDATA[trackDescription]]></gsx:description>"
-      // We format the date here because we can't guarantee/force the timezone
-      + "<gsx:date><![CDATA[" + String.format("%tc", TIME) + "]]></gsx:date>"
+      + "<gsx:date><![CDATA[" + dateFormat.format(new Date(TIME)) + "]]></gsx:date>"
       + "<gsx:totaltime><![CDATA[0:00:05]]></gsx:totaltime>"
       + "<gsx:movingtime><![CDATA[0:00:04]]></gsx:movingtime>"
       + "<gsx:distance><![CDATA[12.43]]></gsx:distance>"
@@ -76,12 +78,12 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
       + "<gsx:maxelevation><![CDATA[1,804]]></gsx:maxelevation>"
       + "<gsx:elevationunit><![CDATA[feet]]></gsx:elevationunit>"
       + "<gsx:map>"
-      + "<![CDATA[http://maps.google.com/maps/ms?msa=0&msid=trackMapId]]>"
+      + "<![CDATA[https://maps.google.com/maps/ms?msa=0&msid=trackMapId]]>"
       + "</gsx:map>"
       + "</entry>";
 
     assertEquals(
-        "http://spreadsheets.google.com/feeds/list/ssid/wsid/private/full",
+        "https://spreadsheets.google.com/feeds/list/ssid/wsid/private/full",
         docsHelper.writtenSheetUri);
     assertEquals(expectedData, docsHelper.writtenData);
   }

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

@@ -53,7 +53,7 @@ public class WriteProgressControllerTest extends ActivityInstrumentationTestCase
       }
     };
 
-    WriteProgressController controller = new WriteProgressController(
+    final WriteProgressController controller = new WriteProgressController(
         getActivity(), mockWriter, SaveActivity.PROGRESS_DIALOG);
     controller.setOnCompletionListener(new WriteProgressController.OnCompletionListener() {
       @Override
@@ -62,6 +62,22 @@ public class WriteProgressControllerTest extends ActivityInstrumentationTestCase
       }
     });
 
+    /*
+     * The WriteProgressController constructor calls the mockWriter's
+     * setOnCompletionListener method with a listener that dismisses the
+     * progress dialog. However, this unit test only tests the
+     * WriteProgressController and doesn't actually show any progress dialog.
+     * Thus after the WriteProgressController is setup, we need to call the
+     * mockWriter's setOnCompletionListener method again with an listener that
+     * doesn't dismiss dialog.
+     */
+    mockWriter.setOnCompletionListener(new TrackWriter.OnCompletionListener() {
+      @Override
+      public void onComplete() {
+        controller.getOnCompletionListener().onComplete();
+      }
+    });
+
     dialogRef.set(controller.createProgressDialog());
 
     controller.startWrite();
@@ -69,7 +85,6 @@ public class WriteProgressControllerTest extends ActivityInstrumentationTestCase
     // wait for the writer to finish
     writerDone.acquire();
 
-    assertFalse(dialogRef.get().isShowing());
     assertTrue(controllerDoneRef.get());
   }
 }