From fb036bfe4cf796ce2a93f99edd295f642171ebef Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 25 Oct 2011 15:02:03 -0700
Subject: [PATCH] Fix unit test errors in DocsHelper_AddTrackRowTest.java

DocsHelper_AddTrackRowTest is using a MockContext, which
cannot be used to call DateFormat.getDateFormat(context).

Refactor a getDisplayDate method in DocsHelper and allow the
test to override the method.

Also update .hgignore to AnnotationProcessor.log.
---
 .hgignore                                     |  2 +-
 .../apps/mytracks/io/docs/DocsHelper.java     | 23 ++++++++++++------
 .../io/docs/DocsHelper_AddTrackRowTest.java   | 24 +++++++++++++------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/.hgignore b/.hgignore
index ffa8823b5..8bd036659 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,7 +4,7 @@ syntax:glob
 */gen/**
 */proguard/**
 .metadata
-MyTracksTest/annotations.log
+MyTracksTest/AnnotationProcessor.log
 **/*.pyc
 **/*.pyo
 syntax: glob
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java
index 101fd9256..f423e85c8 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java
@@ -275,7 +275,6 @@ public class DocsHelper {
   public void addTrackRow(Context context, AuthManager trixAuth,
       String spreadsheetId, String worksheetId, Track track,
       boolean metricUnits) throws IOException {
-
     String worksheetUri = String.format(DOCS_SPREADSHEET_URL_FORMAT,
         spreadsheetId, worksheetId);
     TripStatistics stats = track.getStatistics();
@@ -287,16 +286,11 @@ public class DocsHelper {
     String elevationUnit = context.getString(metricUnits ?
         R.string.meter : R.string.feet);
 
-    java.text.DateFormat dateFormat = DateFormat.getDateFormat(context);
-    java.text.DateFormat timeFormat = DateFormat.getTimeFormat(context);
-    Date startTime = new Date(stats.getStartTime());
-    String dateString = dateFormat.format(startTime) + " " + timeFormat.format(startTime);
-    
     // Prepare the Post-Text we are going to send.
     DocsTagBuilder tagBuilder = new DocsTagBuilder(metricUnits)
         .append("name", track.getName())
         .append("description", track.getDescription())
-        .append("date", dateString)
+        .append("date", getDisplayDate(context, stats.getStartTime()))
         .append("totaltime", StringUtils.formatTimeAlwaysShowingHours(
             stats.getTotalTime()))
         .append("movingtime", StringUtils.formatTimeAlwaysShowingHours(
@@ -336,6 +330,21 @@ public class DocsHelper {
     Log.i(Constants.TAG, "Post finished.");
   }
 
+  /**
+   * Gets the display string for a time based on the phone's setting.
+   *
+   * @param context the context to obtain the phone's setting.
+   * @param time the time
+   * @return the display string of the time
+   */
+  protected String getDisplayDate(Context context, long time) {
+    java.text.DateFormat dateFormat = DateFormat.getDateFormat(context);
+    java.text.DateFormat timeFormat = DateFormat.getTimeFormat(context);
+    Date startTime = new Date(time);
+    String dateString = dateFormat.format(startTime) + " " + timeFormat.format(startTime);
+    return dateString;
+  }
+
   /**
    * Writes spreadsheet row data to the indicated worksheet.
    *
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java
index 7400bcf11..996f77ef5 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java
@@ -40,7 +40,8 @@ import junit.framework.TestCase;
  */
 public class DocsHelper_AddTrackRowTest extends TestCase {
   private static final long TIME = 1288721514000L;
-
+  private static final DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);  
+  
   private static class StringWritingDocsHelper extends DocsHelper {
     String writtenSheetUri = null;
     String writtenData = null;
@@ -52,18 +53,22 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
       writtenData = postText;
     }
   }
-
+  
   public void testAddTrackRow_imperial() throws Exception {
-    StringWritingDocsHelper docsHelper = new StringWritingDocsHelper();
+    StringWritingDocsHelper docsHelper = new StringWritingDocsHelper() {
+      @Override
+      protected String getDisplayDate(Context context, long time) {
+        return DATE_FORMAT.format(new Date(TIME));
+      }
+    };
     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>"
-      + "<gsx:date><![CDATA[" + dateFormat.format(new Date(TIME)) + "]]></gsx:date>"
+      + "<gsx:date><![CDATA[" + DATE_FORMAT.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>"
@@ -89,7 +94,12 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
   }
 
   public void testAddTrackRow_metric() throws Exception {
-    StringWritingDocsHelper docsHelper = new StringWritingDocsHelper();
+    StringWritingDocsHelper docsHelper = new StringWritingDocsHelper() {
+      @Override
+      protected String getDisplayDate(Context context, long time) {
+        return DATE_FORMAT.format(new Date(TIME));
+      }
+    };
     addTrackRow(docsHelper, true);
 
     // The imperial test verifies that the tags come out in the proper order,