Add support to choose the ISO 8601 date format as the default track name.

Note using the "yyyy-MM-dd HH:mm" format so it is readable
for users. However, the colon, ":", is not a valid
FAT32 filename character. So when saving to the SD card,
the filename becomes "yyyy-MM-dd HH_mm".

MyTracksTest/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactoryTest.java

@@ -16,49 +16,55 @@
 package com.google.android.apps.mytracks.services;
 
 import com.google.android.apps.mytracks.util.StringUtils;
+import com.google.android.maps.mytracks.R;
 
-import android.content.Context;
 import android.test.AndroidTestCase;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * Tests {@link DefaultTrackNameFactory}
- * 
+ *
  * @author Matthew Simmons
  */
 public class DefaultTrackNameFactoryTest extends AndroidTestCase {
-  /**
-   * A version of the factory which allows us to supply our own answer as to
-   * whether a timestamp-based track name should be used.
-   */
-  private static class MockDefaultTrackNameFactory
-      extends DefaultTrackNameFactory {
-    private final boolean useTimestamp;
 
-    MockDefaultTrackNameFactory(Context context, boolean useTimestamp) {
-      super(context);
-      this.useTimestamp = useTimestamp;
-    }
-    
-    @Override
-    protected boolean useTimestampTrackName() {
-      return useTimestamp;
-    }
+  private static final int TRACK_ID = 1;
+  private static final long START_TIME = 1288213406000L;
+
+  public void testDefaultTrackName_date_local() {
+    DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext()) {
+      @Override
+      String getTrackNameSetting() {
+        return getContext().getString(R.string.settings_recording_track_name_date_local_value);
+      }
+    };
+    assertEquals(StringUtils.formatDateTime(getContext(), START_TIME),
+        defaultTrackNameFactory.getDefaultTrackName(TRACK_ID, START_TIME));
   }
-  
-  private static final long TIMESTAMP = 1288213406000L;
 
-  public void testTimestampTrackName() {
-    DefaultTrackNameFactory factory =
-        new MockDefaultTrackNameFactory(getContext(), true);
+  public void testDefaultTrackName_date_iso_8601() {
+    DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext()) {
+      @Override
+      String getTrackNameSetting() {
+        return getContext().getString(R.string.settings_recording_track_name_date_iso_8601_value);
+      }
+    };
+    SimpleDateFormat simpleDateFormat = new SimpleDateFormat(
+        DefaultTrackNameFactory.ISO_8601_FORMAT);
+    assertEquals(simpleDateFormat.format(new Date(START_TIME)),
+        defaultTrackNameFactory.getDefaultTrackName(TRACK_ID, START_TIME));
+  }
 
+  public void testDefaultTrackName_number() {
+    DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext()) {
+      @Override
+      String getTrackNameSetting() {
+        return getContext().getString(R.string.settings_recording_track_name_number_value);
+      }
+    };
     assertEquals(
-        StringUtils.formatDateTime(getContext(), TIMESTAMP), factory.newTrackName(1, TIMESTAMP));
-  }
-
-  public void testIncrementingTrackName() {
-    DefaultTrackNameFactory factory =
-        new MockDefaultTrackNameFactory(getContext(), false);
-
-    assertEquals("Track 1", factory.newTrackName(1, TIMESTAMP));
+        "Track " + TRACK_ID, defaultTrackNameFactory.getDefaultTrackName(TRACK_ID, START_TIME));
   }
 }

MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java

@@ -62,13 +62,45 @@ public class FileUtilsTest extends TestCase {
     assertEquals(expectedName, dirName);
   }
 
+  /**
+   * Tests sanitize filename.
+   */
   public void testSanitizeFileName() {
-    String name = "Swim\10ming-^across: the/ pacific (ocean).您好-привет_";
-    String expected = "Swim_ming-_across_the_pacific_ocean_您好-привет_";
+    String name = "Swim\10ming-^across:/the/ pacific (ocean).";
+    String expected = "Swim_ming-^across_the_ pacific (ocean)_";
+    assertEquals(expected, fileUtils.sanitizeFileName(name));
+  }
+
+  /**
+   * Tests characters in other languages, like Chinese and Russian, are allowed.
+   */
+  public void testSanitizeFileName_i18n() {
+    String name = "您好-привет";
+    String expected = "您好-привет";
+    
+    assertEquals(expected, fileUtils.sanitizeFileName(name));
+  }
+  
+  /**
+   * Tests special FAT32 characters are allowed.
+   */
+  public void testSanitizeFileName_special_characters() {
+    String name = "$%'-_@~`!(){}^#&+,;=[] ";
+    String expected = "$%'-_@~`!(){}^#&+,;=[] ";
     
     assertEquals(expected, fileUtils.sanitizeFileName(name));
   }
 
+  /**
+   * Testing collapsing multiple underscores characters.
+   */
+  public void testSanitizeFileName_collapse() {
+    String name = "hello//there";
+    String expected = "hello_there";
+    
+    assertEquals(expected, fileUtils.sanitizeFileName(name));
+  }
+  
   public void testTruncateFileName() {
     File directory = new File("/dir1/dir2/");
     String suffix = ".gpx";