diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java index f5e72bea8..6fe4ce33d 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java @@ -17,7 +17,6 @@ package com.google.android.apps.mytracks.content; import com.google.android.apps.mytracks.stats.TripStatistics; -import com.google.android.apps.mytracks.util.UnitConversions; import com.google.android.maps.mytracks.R; import android.test.AndroidTestCase; @@ -138,10 +137,7 @@ public class DescriptionGeneratorImplTest extends AndroidTestCase { */ public void testWriteSpeed() { StringBuilder builder = new StringBuilder(); - Pair speed = descriptionGenerator.writeSpeed( - 1.1, builder, R.string.description_average_speed, "\n"); - assertEquals(3.96, speed.first); - assertEquals(3.96 * UnitConversions.KM_TO_MI, speed.second); + descriptionGenerator.writeSpeed(1.1, builder, R.string.description_average_speed, "\n"); assertEquals("Average speed: 3.96 km/h (2.5 mi/h)\n", builder.toString()); } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/SendDocsUtilsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/SendDocsUtilsTest.java index 8b416dbd4..00b9caee6 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/SendDocsUtilsTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/SendDocsUtilsTest.java @@ -116,8 +116,8 @@ public class SendDocsUtilsTest extends AndroidTestCase { + "" + "" + "" - + "" - + "" + + "" + + "" + "" + "" + "" @@ -144,8 +144,8 @@ public class SendDocsUtilsTest extends AndroidTestCase { + "" + "" + "" - + "" - + "" + + "" + + "" + "" + "" + "" diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java index 6c1177150..123bca01b 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java @@ -36,21 +36,21 @@ public class CsvTrackWriterTest extends TrackFormatWriterTest { "Accuracy (m)", "Speed (m/s)", "Time"); String expectedMarker1 = getExpectedLine(WAYPOINT1_NAME, WAYPOINT1_CATEGORY, WAYPOINT1_DESCRIPTION, "1.0", "-1.0", "10.0", "100.0", "1,000", "10,000", - "1970-01-01T00:01:40Z"); + "1970-01-01T00:01:40.000Z"); String expectedMarker2 = getExpectedLine(WAYPOINT2_NAME, WAYPOINT2_CATEGORY, WAYPOINT2_DESCRIPTION, "2.0", "-2.0", "20.0", "200.0", "2,000", "20,000", - "1970-01-01T00:03:20Z"); + "1970-01-01T00:03:20.000Z"); String expectedPointHeader = getExpectedLine("Segment", "Point", "Latitude (deg)", "Longitude (deg)", "Altitude (m)", "Bearing (deg)", "Accuracy (m)", "Speed (m/s)", "Time", "Power (W)", "Cadence (rpm)", "Heart rate (bpm)", "Battery level (%)"); String expectedPoint1 = getExpectedLine("1", "1", "0.0", "0.0", "0.0", "0.0", "0", "0", - "1970-01-01T00:00:00Z", "100.0", "200.0", "300.0", "400.0"); + "1970-01-01T00:00:00.000Z", "100.0", "200.0", "300.0", "400.0"); String expectedPoint2 = getExpectedLine("1", "2", "1.0", "-1.0", "10.0", "100.0", "1,000", - "10,000", "1970-01-01T00:01:40Z", "101.0", "201.0", "301.0", "401.0"); + "10,000", "1970-01-01T00:01:40.000Z", "101.0", "201.0", "301.0", "401.0"); String expectedPoint3 = getExpectedLine("2", "1", "2.0", "-2.0", "20.0", "200.0", "2,000", - "20,000", "1970-01-01T00:03:20Z", "102.0", "202.0", "302.0", "402.0"); + "20,000", "1970-01-01T00:03:20.000Z", "102.0", "202.0", "302.0", "402.0"); String expectedPoint4 = getExpectedLine("2", "2", "3.0", "-3.0", "30.0", "300.0", "3,000", - "30,000", "1970-01-01T00:05:00Z", "103.0", "203.0", "303.0", "403.0"); + "30,000", "1970-01-01T00:05:00.000Z", "103.0", "203.0", "303.0", "403.0"); String expected = expectedTrackHeader + expectedTrack + "\n" + expectedMarkerHeader + expectedMarker1 + expectedMarker2 + "\n" + expectedPointHeader + expectedPoint1 + expectedPoint2 + expectedPoint3 + expectedPoint4; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxTrackWriterTest.java index 0a2fe310b..7bb053b88 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxTrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxTrackWriterTest.java @@ -38,23 +38,23 @@ public class GpxTrackWriterTest extends TrackFormatWriterTest { assertEquals(TRACK_DESCRIPTION, getChildTextValue(trackTag, "desc")); List segmentTags = getChildElements(trackTag, "trkseg", 2); List segPointTags = getChildElements(segmentTags.get(0), "trkpt", 2); - assertTagMatchesLocation(segPointTags.get(0), "0", "0", "1970-01-01T00:00:00Z", "0"); - assertTagMatchesLocation(segPointTags.get(1), "1", "-1", "1970-01-01T00:01:40Z", "10"); + assertTagMatchesLocation(segPointTags.get(0), "0", "0", "1970-01-01T00:00:00.000Z", "0"); + assertTagMatchesLocation(segPointTags.get(1), "1", "-1", "1970-01-01T00:01:40.000Z", "10"); segPointTags = getChildElements(segmentTags.get(1), "trkpt", 2); - assertTagMatchesLocation(segPointTags.get(0), "2", "-2", "1970-01-01T00:03:20Z", "20"); - assertTagMatchesLocation(segPointTags.get(1), "3", "-3", "1970-01-01T00:05:00Z", "30"); + assertTagMatchesLocation(segPointTags.get(0), "2", "-2", "1970-01-01T00:03:20.000Z", "20"); + assertTagMatchesLocation(segPointTags.get(1), "3", "-3", "1970-01-01T00:05:00.000Z", "30"); List 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-01T00:01:40Z", "10"); + assertTagMatchesLocation(wptTag, "1", "-1", "1970-01-01T00:01:40.000Z", "10"); wptTag = waypointTags.get(1); assertEquals(WAYPOINT2_NAME, getChildTextValue(wptTag, "name")); assertEquals(WAYPOINT2_DESCRIPTION, getChildTextValue(wptTag, "desc")); - assertTagMatchesLocation(wptTag, "2", "-2", "1970-01-01T00:03:20Z", "20"); + assertTagMatchesLocation(wptTag, "2", "-2", "1970-01-01T00:03:20.000Z", "20"); } /** diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java index 92c830953..c2026d32b 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java @@ -11,7 +11,6 @@ import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext; import com.google.android.apps.mytracks.testing.TestingProviderUtilsFactory; -import com.google.android.maps.mytracks.R; import android.content.Context; import android.location.Location; @@ -25,7 +24,6 @@ import java.io.FileNotFoundException; import java.io.OutputStream; import org.easymock.EasyMock; -import org.easymock.IAnswer; import org.easymock.IArgumentMatcher; import org.easymock.IMocksControl; @@ -185,43 +183,6 @@ public class TrackWriterTest extends AndroidTestCase { mocksControl.verify(); } - public void testWriteTrack_cancelled() throws Exception { - final ByteArrayOutputStream stream = new ByteArrayOutputStream(); - writer = new OpenFileTrackWriter( - getContext(), providerUtils, track, formatWriter, stream, true); - - formatWriter.prepare(track, stream); - - final Location[] locs = { - new Location("fake0"), - new Location("fake1"), - }; - fillLocations(locs); - assertEquals(locs.length, providerUtils.bulkInsertTrackPoints(locs, locs.length, TRACK_ID)); - - formatWriter.writeHeader(); - formatWriter.writeBeginTrack(locEq(locs[0])); - formatWriter.writeOpenSegment(); - - formatWriter.writeLocation(locEq(locs[0])); - //EasyMock.expectLastCall().andThrow(new InterruptedException()); - EasyMock.expectLastCall().andAnswer(new IAnswer() { - @Override - public Object answer() throws Throwable { - throw new InterruptedException(); - } - }); - - mocksControl.replay(); - - writer.writeTrack(); - - mocksControl.verify(); - - assertFalse(writer.wasSuccess()); - assertEquals(R.string.sd_card_canceled, writer.getErrorMessage()); - } - public void testWriteTrack_openFails() { writer = new WriteTracksTrackWriter(getContext(), providerUtils, track, formatWriter, false); @@ -316,8 +277,10 @@ public class TrackWriterTest extends AndroidTestCase { formatWriter.writeHeader(); // Expect reading/writing of the waypoints (except the first) + formatWriter.writeBeginWaypoints(); formatWriter.writeWaypoint(wptEq(wps[1])); formatWriter.writeWaypoint(wptEq(wps[2])); + formatWriter.writeEndWaypoints(); // Begin the track formatWriter.writeBeginTrack(locEq(locs[0]));