From ccd131c0d501e032e791b80b4c234750cd11e2b6 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 31 Jul 2019 09:11:23 -0700 Subject: Remove test assumption of interface token layout. Since it is not API. Bug: 138691255 Test: atest android.os.ParcelTest Change-Id: I1c51344151bf3ae5b6424e75195782aec8064246 --- core/tests/coretests/src/android/os/ParcelTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/tests/coretests/src/android/os/ParcelTest.java b/core/tests/coretests/src/android/os/ParcelTest.java index 0eba2edbb3c3..cdc3a92161c8 100644 --- a/core/tests/coretests/src/android/os/ParcelTest.java +++ b/core/tests/coretests/src/android/os/ParcelTest.java @@ -56,10 +56,8 @@ public class ParcelTest { @Test public void testCallingWorkSourceUidAfterEnforce() { Parcel p = Parcel.obtain(); - // Write headers manually so that we do not invoke #writeInterfaceToken. - p.writeInt(1); // strict mode header - p.writeInt(WORK_SOURCE_1); // worksource header. - p.writeString(INTERFACE_TOKEN_1); // interface token. + p.writeInterfaceToken(INTERFACE_TOKEN_1); + assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_1)); p.setDataPosition(0); p.enforceInterface(INTERFACE_TOKEN_1); -- cgit v1.2.3-59-g8ed1b From 1d28afeb6409272058d742a371556bce51fb7990 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 31 Jul 2019 09:14:01 -0700 Subject: ParcelTest: use different work source for updates We can improve the test slightly by using a different value when we update work sources. Bug: N/A Test: android.os.ParcelTest Change-Id: I5f4905667842a63d31839d610c405333b915cae8 --- core/tests/coretests/src/android/os/ParcelTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/tests/coretests/src/android/os/ParcelTest.java b/core/tests/coretests/src/android/os/ParcelTest.java index cdc3a92161c8..46873b9eb70b 100644 --- a/core/tests/coretests/src/android/os/ParcelTest.java +++ b/core/tests/coretests/src/android/os/ParcelTest.java @@ -43,8 +43,8 @@ public class ParcelTest { // WorkSource can be updated. p.writeInterfaceToken(INTERFACE_TOKEN_1); - assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_1)); - assertEquals(WORK_SOURCE_1, p.readCallingWorkSourceUid()); + assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_2)); + assertEquals(WORK_SOURCE_2, p.readCallingWorkSourceUid()); // WorkSource can be updated to unset value. assertEquals(true, p.replaceCallingWorkSourceUid(Binder.UNSET_WORKSOURCE)); @@ -64,8 +64,8 @@ public class ParcelTest { assertEquals(WORK_SOURCE_1, p.readCallingWorkSourceUid()); // WorkSource can be updated. - assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_1)); - assertEquals(WORK_SOURCE_1, p.readCallingWorkSourceUid()); + assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_2)); + assertEquals(WORK_SOURCE_2, p.readCallingWorkSourceUid()); p.recycle(); } -- cgit v1.2.3-59-g8ed1b