diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequestTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequestTest.java index f9ff8ab5d..00ba4d282 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequestTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequestTest.java @@ -141,6 +141,8 @@ public class SendRequestTest extends AndroidTestCase { parcel.writeLong(2); parcel.writeString(""); parcel.writeString(""); + parcel.writeString(""); + parcel.writeByte((byte) 1); parcel.writeByte((byte) 1); parcel.writeByte((byte) 1); parcel.writeByte((byte) 1); @@ -151,17 +153,21 @@ public class SendRequestTest extends AndroidTestCase { parcel.writeByte((byte) 1); parcel.writeByte((byte) 1); parcel.writeByte((byte) 1); + parcel.writeByte((byte) 1); parcel.setDataPosition(0); sendRequest = SendRequest.CREATOR.createFromParcel(parcel); assertEquals(2, sendRequest.getTrackId()); assertEquals("", sendRequest.getSharingAppPackageName()); assertEquals("", sendRequest.getSharingAppClassName()); + assertEquals("", sendRequest.getAcl()); + assertTrue(sendRequest.isSendDrive()); assertTrue(sendRequest.isSendMaps()); assertTrue(sendRequest.isSendFusionTables()); assertTrue(sendRequest.isSendDocs()); assertTrue(sendRequest.isNewMap()); assertEquals(account, sendRequest.getAccount()); assertEquals(MAPID, sendRequest.getMapId()); + assertTrue(sendRequest.isDriveSuccess()); assertTrue(sendRequest.isMapsSuccess()); assertTrue(sendRequest.isFusionTablesSuccess()); assertTrue(sendRequest.isDocsSuccess()); @@ -176,6 +182,8 @@ public class SendRequestTest extends AndroidTestCase { parcel.writeLong(4); parcel.writeString(null); parcel.writeString(null); + parcel.writeString(null); + parcel.writeByte((byte) 0); parcel.writeByte((byte) 0); parcel.writeByte((byte) 0); parcel.writeByte((byte) 0); @@ -186,17 +194,21 @@ public class SendRequestTest extends AndroidTestCase { parcel.writeByte((byte) 0); parcel.writeByte((byte) 0); parcel.writeByte((byte) 0); + parcel.writeByte((byte) 0); parcel.setDataPosition(0); sendRequest = SendRequest.CREATOR.createFromParcel(parcel); assertEquals(4, sendRequest.getTrackId()); assertNull(sendRequest.getSharingAppPackageName()); assertNull(sendRequest.getSharingAppClassName()); + assertNull(sendRequest.getAcl()); + assertFalse(sendRequest.isSendDrive()); assertFalse(sendRequest.isSendMaps()); assertFalse(sendRequest.isSendFusionTables()); assertFalse(sendRequest.isSendDocs()); assertFalse(sendRequest.isNewMap()); assertEquals(account, sendRequest.getAccount()); assertEquals(MAPID, sendRequest.getMapId()); + assertFalse(sendRequest.isDriveSuccess()); assertFalse(sendRequest.isMapsSuccess()); assertFalse(sendRequest.isFusionTablesSuccess()); assertFalse(sendRequest.isDocsSuccess()); @@ -214,24 +226,30 @@ public class SendRequestTest extends AndroidTestCase { long trackId = parcel.readLong(); String sharingAppPackageName = parcel.readString(); String sharingAppClassName = parcel.readString(); + String acl = parcel.readString(); + boolean sendDrive = parcel.readByte() == 1; boolean sendMaps = parcel.readByte() == 1; boolean sendFusionTables = parcel.readByte() == 1; boolean sendDocs = parcel.readByte() == 1; boolean newMap = parcel.readByte() == 1; Parcelable account = parcel.readParcelable(null); String mapId = parcel.readString(); + boolean driveSuccess = parcel.readByte() == 1; boolean mapsSuccess = parcel.readByte() == 1; boolean fusionTablesSuccess = parcel.readByte() == 1; boolean docsSuccess = parcel.readByte() == 1; assertEquals(1, trackId); assertNull(sharingAppPackageName); assertNull(sharingAppClassName); + assertNull(acl); + assertFalse(sendDrive); assertFalse(sendMaps); assertFalse(sendFusionTables); assertFalse(sendDocs); assertFalse(newMap); assertNull(account); assertNull(mapId); + assertFalse(driveSuccess); assertFalse(mapsSuccess); assertFalse(fusionTablesSuccess); assertFalse(docsSuccess); @@ -243,7 +261,9 @@ public class SendRequestTest extends AndroidTestCase { public void testWriteToParcel() { sendRequest = new SendRequest(4); sendRequest.setSharingAppPackageName("package"); - sendRequest.setSharingAppClassName("class"); + sendRequest.setSharingAppClassName("class"); + sendRequest.setAcl("acl"); + sendRequest.setSendDrive(true); sendRequest.setSendMaps(true); sendRequest.setSendFusionTables(true); sendRequest.setSendDocs(true); @@ -252,6 +272,7 @@ public class SendRequestTest extends AndroidTestCase { sendRequest.setAccount(accountNew); sendRequest.setMapId(MAPID); sendRequest.setMapsSuccess(true); + sendRequest.setDriveSuccess(true); sendRequest.setFusionTablesSuccess(true); sendRequest.setDocsSuccess(true); Parcel parcel = Parcel.obtain(); @@ -261,24 +282,30 @@ public class SendRequestTest extends AndroidTestCase { long trackId = parcel.readLong(); String sharingAppPackageName = parcel.readString(); String sharingAppClassName = parcel.readString(); + String acl = parcel.readString(); + boolean sendDrive = parcel.readByte() == 1; boolean sendMaps = parcel.readByte() == 1; boolean sendFusionTables = parcel.readByte() == 1; boolean sendDocs = parcel.readByte() == 1; boolean newMap = parcel.readByte() == 1; Parcelable account = parcel.readParcelable(null); String mapId = parcel.readString(); + boolean driveSuccess = parcel.readByte() == 1; boolean mapsSuccess = parcel.readByte() == 1; boolean fusionTablesSuccess = parcel.readByte() == 1; boolean docsSuccess = parcel.readByte() == 1; assertEquals(4, trackId); assertEquals("package", sharingAppPackageName); assertEquals("class", sharingAppClassName); + assertEquals("acl", acl); + assertTrue(sendDrive); assertTrue(sendMaps); assertTrue(sendFusionTables); assertTrue(sendDocs); assertTrue(newMap); assertEquals(accountNew, account); assertEquals(MAPID, mapId); + assertTrue(driveSuccess); assertTrue(mapsSuccess); assertTrue(fusionTablesSuccess); assertTrue(docsSuccess);