Cleanup GpxTrackWriter

- remove xml-stylesheet (not used)
- remove the "<number>" tag (do not want to expose internally used track id)
- add <metadata> for name and description
- change the text for the "creator" attribute
- change KmlTrackWriter to use FileUtils.FILE_TIMESTAMP_FORMAT

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

@@ -1,23 +1,34 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.google.android.apps.mytracks.io.file;
 
-import com.google.android.apps.mytracks.io.file.GpxTrackWriter;
-import com.google.android.apps.mytracks.io.file.TrackFormatWriter;
+import java.util.List;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import java.util.List;
-
 /**
- * Tests for the GPX track exporter.
+ * Tests for {@link GpxTrackWriter}.
  *
  * @author Rodrigo Damazio
  */
 public class GpxTrackWriterTest extends TrackFormatWriterTest {
 
   public void testXmlOutput() throws Exception {
-    TrackFormatWriter writer = new GpxTrackWriter();
+    TrackFormatWriter writer = new GpxTrackWriter(getContext());
     String result = writeTrack(writer);
     Document doc = parseXmlDocument(result);
 
@@ -25,44 +36,41 @@ public class GpxTrackWriterTest extends TrackFormatWriterTest {
     Element trackTag = getChildElement(gpxTag, "trk");
     assertEquals(TRACK_NAME, getChildTextValue(trackTag, "name"));
     assertEquals(TRACK_DESCRIPTION, getChildTextValue(trackTag, "desc"));
-    assertEquals(Long.toString(TRACK_ID),
-        getChildTextValue(trackTag, "number"));
     List<Element> segmentTags = getChildElements(trackTag, "trkseg", 2);
     List<Element> segPointTags = getChildElements(segmentTags.get(0), "trkpt", 2);
-    assertTagMatchesLocation(segPointTags.get(0),
-        "0", "0", "1970-01-01T02:46:40Z", "0");
-    assertTagMatchesLocation(segPointTags.get(1),
-        "1", "-1", "1970-01-01T02:46:41Z", "5000000");
+    assertTagMatchesLocation(segPointTags.get(0), "0", "0", "1970-01-01T02:46:40Z", "0");
+    assertTagMatchesLocation(segPointTags.get(1), "1", "-1", "1970-01-01T02:46:41Z", "5000000");
 
     segPointTags = getChildElements(segmentTags.get(1), "trkpt", 2);
-    assertTagMatchesLocation(segPointTags.get(0),
-        "2", "-2", "1970-01-01T02:46:42Z", "10000000");
-    assertTagMatchesLocation(segPointTags.get(1),
-        "3", "-3", "1970-01-01T02:46:43Z", "15000000");
+    assertTagMatchesLocation(segPointTags.get(0), "2", "-2", "1970-01-01T02:46:42Z", "10000000");
+    assertTagMatchesLocation(segPointTags.get(1), "3", "-3", "1970-01-01T02:46:43Z", "15000000");
 
     List<Element> waypointTags = getChildElements(gpxTag, "wpt", 2);
     Element wptTag = waypointTags.get(0);
     assertEquals(WAYPOINT1_NAME, getChildTextValue(wptTag, "name"));
     assertEquals(WAYPOINT1_DESCRIPTION, getChildTextValue(wptTag, "desc"));
-    assertTagMatchesLocation(wptTag,
-        "1", "-1", "1970-01-01T02:46:41Z", "5000000");
+    assertTagMatchesLocation(wptTag, "1", "-1", "1970-01-01T02:46:41Z", "5000000");
 
     wptTag = waypointTags.get(1);
     assertEquals(WAYPOINT2_NAME, getChildTextValue(wptTag, "name"));
     assertEquals(WAYPOINT2_DESCRIPTION, getChildTextValue(wptTag, "desc"));
-    assertTagMatchesLocation(wptTag,
-        "2", "-2", "1970-01-01T02:46:42Z", "10000000");
+    assertTagMatchesLocation(wptTag, "2", "-2", "1970-01-01T02:46:42Z", "10000000");
   }
 
   /**
-   * Asserts that the given tag describes the location given by the
-   * Strings lat, lon, time, and ele.
+   * Asserts that the given tag describes a location.
+   *
+   * @param tag the tag
+   * @param latitude the location's latitude
+   * @param longitude the location's longitude
+   * @param time the location's time
+   * @param elevation the location's elevation
    */
-  private void assertTagMatchesLocation(Element tag, String lat,
-      String lon, String time, String ele) {
-    assertEquals(lat, tag.getAttribute("lat"));
-    assertEquals(lon, tag.getAttribute("lon"));
+  private void assertTagMatchesLocation(
+      Element tag, String latitude, String longitude, String time, String elevation) {
+    assertEquals(latitude, tag.getAttribute("lat"));
+    assertEquals(longitude, tag.getAttribute("lon"));
     assertEquals(time, getChildTextValue(tag, "time"));
-    assertEquals(ele, getChildTextValue(tag, "ele"));
+    assertEquals(elevation, getChildTextValue(tag, "ele"));
   }
 }

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

@@ -13,7 +13,6 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-
 package com.google.android.apps.mytracks.io.file;
 
 import com.google.android.apps.mytracks.content.DescriptionGenerator;
@@ -34,6 +33,7 @@ import org.w3c.dom.Element;
  * @author Rodrigo Damazio
  */
 public class KmlTrackWriterTest extends TrackFormatWriterTest {
+
   private static final String FULL_TRACK_DESCRIPTION = "full track description";
 
   /**

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

@@ -45,7 +45,6 @@ public abstract class TrackFormatWriterTest extends AndroidTestCase {
   protected static final String WAYPOINT2_NAME = "point]]>2";
   protected static final String WAYPOINT2_DESCRIPTION = "point 2]]>description";
   private static final int BUFFER_SIZE = 10240;
-  protected static final long TRACK_ID = 12345L;
   protected Track track;
   protected MyTracksLocation location1, location2, location3, location4;
   protected Waypoint wp1, wp2;
@@ -55,7 +54,6 @@ public abstract class TrackFormatWriterTest extends AndroidTestCase {
     super.setUp();
 
     track = new Track();
-    track.setId(TRACK_ID);
     track.setName(TRACK_NAME);
     track.setDescription(TRACK_DESCRIPTION);