diff options
author | Hsin-Yi Chen <hsinyichen@google.com> | 2017-07-28 11:28:52 +0800 |
---|---|---|
committer | Keun Soo Yim <yim@google.com> | 2018-01-23 20:55:37 +0000 |
commit | 45681ecf27935d8430ace4d20e0d611ad7327e23 (patch) | |
tree | 4bb8abab137f0d211f5362e0d208e06239b501e6 | |
parent | ba54d5baf4265cc5ccf656638bf6c5d9e770592f (diff) | |
download | native-45681ecf27935d8430ace4d20e0d611ad7327e23.tar.gz |
Cast binder data type to uint64_t in high bits test
1. Cast fb->binder to uint64_t before shifting by 32 bits. It avoids
undefined result when binder is 32-bit.
2. Swap EXPECT_EQ arguments. The first one is expected value and the
second is actual value.
Bug: 64118463
Test: ./binderLibTest on x86 emulator
Merged-In: I4f736bd5b55db5af8598db0d5cd5fbd9ef323448
Change-Id: I4f736bd5b55db5af8598db0d5cd5fbd9ef323448
(cherry picked from commit 7e04edd5b3f0ca9a2d8bca78d5ae70c09b623299)
(cherry picked from commit 3b7d54dd791dfb58b6e42429311dd7ec9a4f1bb6)
-rw-r--r-- | libs/binder/tests/binderLibTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp index 757291cd2a..a04869ae62 100644 --- a/libs/binder/tests/binderLibTest.cpp +++ b/libs/binder/tests/binderLibTest.cpp @@ -681,10 +681,10 @@ TEST_F(BinderLibTest, CheckHandleZeroBinderHighBitsZeroCookie) { const flat_binder_object *fb = reply.readObject(false); ASSERT_TRUE(fb != NULL); - EXPECT_EQ(fb->type, BINDER_TYPE_HANDLE); - EXPECT_EQ(ProcessState::self()->getStrongProxyForHandle(fb->handle), m_server); - EXPECT_EQ(fb->cookie, (binder_uintptr_t)0); - EXPECT_EQ(fb->binder >> 32, (binder_uintptr_t)0); + EXPECT_EQ(BINDER_TYPE_HANDLE, fb->type); + EXPECT_EQ(m_server, ProcessState::self()->getStrongProxyForHandle(fb->handle)); + EXPECT_EQ((binder_uintptr_t)0, fb->cookie); + EXPECT_EQ((uint64_t)0, (uint64_t)fb->binder >> 32); } TEST_F(BinderLibTest, FreedBinder) { |