Merge heads

MyTracksTest/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesUtilsTest.java

@@ -32,36 +32,23 @@ import junit.framework.TestCase;
 public class SendFusionTablesUtilsTest extends TestCase {
 
   /**
-   * Tests {@link SendFusionTablesUtils#getMapUrl(Track)} with null track.
+   * Tests {@link SendFusionTablesUtils#getMapUrl(Track, String)} with null track.
    */
   public void testGetMapUrl_null_track() {
-    assertEquals(null, SendFusionTablesUtils.getMapUrl(null));
+    assertEquals(null, SendFusionTablesUtils.getMapUrl(null, "123"));
   }
 
   /**
-   * Tests {@link SendFusionTablesUtils#getMapUrl(Track)} with null table id.
-   */
-  public void testGetMapUrl_null_table_id() {
-    Track track = new Track();
-    TripStatistics stats = new TripStatistics();
-    stats.setBounds((int) 100.E6, (int) 10.E6, (int) 50.E6, (int) 5.E6);
-    track.setTripStatistics(stats);
-    track.setTableId(null);
-    assertEquals(null, SendFusionTablesUtils.getMapUrl(track));
-  }
-
-  /**
-   * Tests {@link SendFusionTablesUtils#getMapUrl(Track)} with null stats.
+   * Tests {@link SendFusionTablesUtils#getMapUrl(Track, String)} with null stats.
    */
   public void testGetMapUrl_null_stats() {
     Track track = new Track();
     track.setTripStatistics(null);
-    track.setTableId("123");
-    assertEquals(null, SendFusionTablesUtils.getMapUrl(track));
+    assertEquals(null, SendFusionTablesUtils.getMapUrl(track, "123"));
   }
 
   /**
-   * Tests {@link SendFusionTablesUtils#getMapUrl(Track)} with a valid track.
+   * Tests {@link SendFusionTablesUtils#getMapUrl(Track, String)} with a valid track.
    */
   public void testGetMapUrl_valid_track() {
     Track track = new Track();
@@ -69,11 +56,10 @@ public class SendFusionTablesUtilsTest extends TestCase {
     TripStatistics stats = new TripStatistics();
     stats.setBounds((int) 100.E6, (int) 10.E6, (int) 50.E6, (int) 5.E6);
     track.setTripStatistics(stats);
-    track.setTableId("123");
     assertEquals(
         "https://www.google.com/fusiontables/embedviz?"
             + "viz=MAP&q=select+col0,+col1,+col2,+col3+from+123+&h=false&lat=7.500000&lng=75.000000"
-            + "&z=15&t=1&l=col2", SendFusionTablesUtils.getMapUrl(track));
+            + "&z=15&t=1&l=col2", SendFusionTablesUtils.getMapUrl(track, "123"));
   }
 
   /**

MyTracksTest/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTaskTest.java

@@ -89,23 +89,6 @@ public class SendMapsAsyncTaskTest extends AndroidTestCase {
     AndroidMock.expect(sendMapsActivityMock.getApplicationContext()).andReturn(getContext());
   }
 
-  /**
-   * Tests the method {@link SendMapsAsyncTask#saveResult()}and makes sure the
-   * track is updated.
-   */
-  public void testSaveResult() {
-    Track track = TrackStubUtils.createTrack(1);
-    track.setMapId(null);
-    AndroidMock.expect(myTracksProviderUtilsMock.getTrack(TRACK_ID)).andReturn(track);
-    myTracksProviderUtilsMock.updateTrack(track);
-
-    AndroidMock.replay(sendMapsActivityMock, myTracksProviderUtilsMock);
-    SendMapsAsyncTask sendMapsAsyncTask = new SendMapsAsyncTask(sendMapsActivityMock,
-        sendRequest.getTrackId(), sendRequest.getAccount(), myTracksProviderUtilsMock);
-    sendMapsAsyncTask.saveResult();
-    AndroidMock.verify(sendMapsActivityMock, myTracksProviderUtilsMock);
-  }
-
   /**
    * Tests {@link SendMapsAsyncTask#fetchSendMapId(Track)} when chooseMapId is
    * null and makes sure it returns false.

MyTracksTest/src/com/google/android/apps/mytracks/io/maps/SendMapsUtilsTest.java

@@ -15,7 +15,6 @@
  */
 package com.google.android.apps.mytracks.io.maps;
 
-import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.io.gdata.maps.MapsFeature;
 
 import android.location.Location;
@@ -31,31 +30,6 @@ import junit.framework.TestCase;
  */
 public class SendMapsUtilsTest extends TestCase {
 
-  /**
-   * Tests {@link SendMapsUtils#getMapUrl(Track)} with null track.
-   */
-  public void testGetMapUrl_null_track() {
-    assertEquals(null, SendMapsUtils.getMapUrl(null));
-  }
-
-  /**
-   * Tests {@link SendMapsUtils#getMapUrl(Track)} with null map id.
-   */
-  public void testGetMapUrl_null_map_id() {
-    Track track = new Track();
-    track.setMapId(null);
-    assertEquals(null, SendMapsUtils.getMapUrl(track));
-  }
-
-  /**
-   * Tests {@link SendMapsUtils#getMapUrl(Track)} with a valid track.
-   */
-  public void testGetMapUrl_valid_track() {
-    Track track = new Track();
-    track.setMapId("123");
-    assertEquals("https://maps.google.com/maps/ms?msa=0&msid=123", SendMapsUtils.getMapUrl(track));
-  }
-
   /**
    * Test {@link SendMapsUtils#buildMapsMarkerFeature(String, String, String,
    * Location)} with a title.

MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequestTest.java

@@ -32,6 +32,7 @@ public class SendRequestTest extends AndroidTestCase {
   private final static String ACCOUNTNAME = "testAccount1";
   private final static String ACCOUNTYPE = "testType1";
   private final static String DRIVE_SHARE_EMAILS = "foo@foo.com";
+  private final static String SHARE_URL = "url@url.com";
 
   @Override
   protected void setUp() throws Exception {
@@ -128,12 +129,14 @@ public class SendRequestTest extends AndroidTestCase {
     parcel.writeByte((byte) 1);
     parcel.writeByte((byte) 1);
     parcel.writeString(DRIVE_SHARE_EMAILS);
+    parcel.writeByte((byte) 1);
     Account account = new Account(ACCOUNTNAME, ACCOUNTYPE);
     parcel.writeParcelable(account, 0);
     parcel.writeByte((byte) 1);
     parcel.writeByte((byte) 1);
     parcel.writeByte((byte) 1);
     parcel.writeByte((byte) 1);
+    parcel.writeString(SHARE_URL);
     parcel.setDataPosition(0);
     sendRequest = SendRequest.CREATOR.createFromParcel(parcel);
     assertEquals(2, sendRequest.getTrackId());
@@ -144,11 +147,13 @@ public class SendRequestTest extends AndroidTestCase {
     assertTrue(sendRequest.isDriveEnableSync());
     assertTrue(sendRequest.isDriveShare());
     assertEquals(DRIVE_SHARE_EMAILS, sendRequest.getDriveShareEmails());
+    assertTrue(sendRequest.isDriveSharePublic());
     assertEquals(account, sendRequest.getAccount());
     assertTrue(sendRequest.isDriveSuccess());
     assertTrue(sendRequest.isMapsSuccess());
     assertTrue(sendRequest.isFusionTablesSuccess());
     assertTrue(sendRequest.isSpreadsheetsSuccess());
+    assertEquals(SHARE_URL, sendRequest.getShareUrl());
   }
 
   /**
@@ -165,12 +170,14 @@ public class SendRequestTest extends AndroidTestCase {
     parcel.writeByte((byte) 0);
     parcel.writeByte((byte) 0);
     parcel.writeString(null);
+    parcel.writeByte((byte) 0);
     Account account = new Account(ACCOUNTNAME, ACCOUNTYPE);
     parcel.writeParcelable(account, 0);
     parcel.writeByte((byte) 0);
     parcel.writeByte((byte) 0);
     parcel.writeByte((byte) 0);
     parcel.writeByte((byte) 0);
+    parcel.writeString(null);
     parcel.setDataPosition(0);
     sendRequest = SendRequest.CREATOR.createFromParcel(parcel);
     assertEquals(4, sendRequest.getTrackId());
@@ -181,11 +188,13 @@ public class SendRequestTest extends AndroidTestCase {
     assertFalse(sendRequest.isDriveEnableSync());
     assertFalse(sendRequest.isDriveShare());
     assertNull(sendRequest.getDriveShareEmails());
+    assertFalse(sendRequest.isDriveSharePublic());
     assertEquals(account, sendRequest.getAccount());
     assertFalse(sendRequest.isDriveSuccess());
     assertFalse(sendRequest.isMapsSuccess());
     assertFalse(sendRequest.isFusionTablesSuccess());
     assertFalse(sendRequest.isSpreadsheetsSuccess());
+    assertNull(sendRequest.getShareUrl());
   }
 
   /**
@@ -202,14 +211,16 @@ public class SendRequestTest extends AndroidTestCase {
     boolean sendMaps = parcel.readByte() == 1;
     boolean sendFusionTables = parcel.readByte() == 1;
     boolean sendSpreadsheets = parcel.readByte() == 1;
-    boolean driveEnableSync = parcel.readByte() == 1;    
+    boolean driveEnableSync = parcel.readByte() == 1;
     boolean driveShare = parcel.readByte() == 1;
     String dirveShareEmails = parcel.readString();
+    boolean driveSharePublic = parcel.readByte() == 1;
     Parcelable account = parcel.readParcelable(null);
     boolean driveSuccess = parcel.readByte() == 1;
     boolean mapsSuccess = parcel.readByte() == 1;
     boolean fusionTablesSuccess = parcel.readByte() == 1;
     boolean spreadsheetsSuccess = parcel.readByte() == 1;
+    String shareUrl = parcel.readString();
     assertEquals(1, trackId);
     assertFalse(sendDrive);
     assertFalse(sendMaps);
@@ -218,11 +229,13 @@ public class SendRequestTest extends AndroidTestCase {
     assertFalse(driveEnableSync);
     assertFalse(driveShare);
     assertNull(dirveShareEmails);
+    assertFalse(driveSharePublic);
     assertNull(account);
     assertFalse(driveSuccess);
     assertFalse(mapsSuccess);
     assertFalse(fusionTablesSuccess);
     assertFalse(spreadsheetsSuccess);
+    assertNull(shareUrl);
   }
 
   /**
@@ -237,12 +250,14 @@ public class SendRequestTest extends AndroidTestCase {
     sendRequest.setDriveEnableSync(true);
     sendRequest.setDriveShare(true);
     sendRequest.setDriveShareEmails(DRIVE_SHARE_EMAILS);
+    sendRequest.setDriveSharePublic(true);
     Account accountNew = new Account(ACCOUNTNAME + "2", ACCOUNTYPE + "2");
     sendRequest.setAccount(accountNew);
     sendRequest.setMapsSuccess(true);
     sendRequest.setDriveSuccess(true);
     sendRequest.setFusionTablesSuccess(true);
     sendRequest.setSpreadsheetsSuccess(true);
+    sendRequest.setShareUrl(SHARE_URL);
     Parcel parcel = Parcel.obtain();
     parcel.setDataPosition(0);
     sendRequest.writeToParcel(parcel, 1);
@@ -255,11 +270,13 @@ public class SendRequestTest extends AndroidTestCase {
     boolean driveEnableSync = parcel.readByte() == 1;
     boolean driveShare = parcel.readByte() == 1;
     String driveShareEmails = parcel.readString();
+    boolean driveSharePublic = parcel.readByte() == 1;
     Parcelable account = parcel.readParcelable(null);
     boolean driveSuccess = parcel.readByte() == 1;
     boolean mapsSuccess = parcel.readByte() == 1;
     boolean fusionTablesSuccess = parcel.readByte() == 1;
     boolean spreadsheetsSuccess = parcel.readByte() == 1;
+    String shareUrl = parcel.readString();
     assertEquals(4, trackId);
     assertTrue(sendDrive);
     assertTrue(sendMaps);
@@ -268,10 +285,12 @@ public class SendRequestTest extends AndroidTestCase {
     assertTrue(driveEnableSync);
     assertTrue(driveShare);
     assertEquals(DRIVE_SHARE_EMAILS, driveShareEmails);
+    assertTrue(driveSharePublic);
     assertEquals(accountNew, account);
     assertTrue(driveSuccess);
     assertTrue(mapsSuccess);
     assertTrue(fusionTablesSuccess);
     assertTrue(spreadsheetsSuccess);
+    assertEquals(SHARE_URL, shareUrl);
   }
 }