diff options
author | Howard Chen | 2017-12-02 09:21:19 -0600 |
---|---|---|
committer | Gerrit Code Review | 2017-12-02 09:21:19 -0600 |
commit | 4cd07b6e215678689752b730dabd504af080a8b7 (patch) | |
tree | 524198737f3d99639c46eec303f1a39dbd340939 /tests | |
parent | dc1921810e4af260c6312c7708fcf64dfcf3d4bb (diff) | |
parent | 4e7ccc4cb9a7586f067aeef5a16092be9325e340 (diff) | |
download | platform-hardware-interfaces-4cd07b6e215678689752b730dabd504af080a8b7.tar.gz platform-hardware-interfaces-4cd07b6e215678689752b730dabd504af080a8b7.tar.xz platform-hardware-interfaces-4cd07b6e215678689752b730dabd504af080a8b7.zip |
Merge "Add more test methods to IMemoryTest"
Diffstat (limited to 'tests')
-rw-r--r-- | tests/memory/1.0/Android.bp | 2 | ||||
-rw-r--r-- | tests/memory/1.0/IMemoryTest.hal | 6 | ||||
-rw-r--r-- | tests/memory/1.0/default/Android.bp | 1 | ||||
-rw-r--r-- | tests/memory/1.0/default/MemoryTest.cpp | 17 | ||||
-rw-r--r-- | tests/memory/1.0/default/MemoryTest.h | 16 |
5 files changed, 40 insertions, 2 deletions
diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp index cd97fe48..50386649 100644 --- a/tests/memory/1.0/Android.bp +++ b/tests/memory/1.0/Android.bp | |||
@@ -7,6 +7,8 @@ hidl_interface { | |||
7 | "IMemoryTest.hal", | 7 | "IMemoryTest.hal", |
8 | ], | 8 | ], |
9 | interfaces: [ | 9 | interfaces: [ |
10 | "android.hidl.memory.token@1.0", | ||
11 | "android.hidl.memory.block@1.0", | ||
10 | "android.hidl.base@1.0", | 12 | "android.hidl.base@1.0", |
11 | ], | 13 | ], |
12 | gen_java: false, | 14 | gen_java: false, |
diff --git a/tests/memory/1.0/IMemoryTest.hal b/tests/memory/1.0/IMemoryTest.hal index 4d6de3f2..b20859cc 100644 --- a/tests/memory/1.0/IMemoryTest.hal +++ b/tests/memory/1.0/IMemoryTest.hal | |||
@@ -16,7 +16,13 @@ | |||
16 | 16 | ||
17 | package android.hardware.tests.memory@1.0; | 17 | package android.hardware.tests.memory@1.0; |
18 | 18 | ||
19 | import android.hidl.memory.token@1.0::IMemoryToken; | ||
20 | import android.hidl.memory.block@1.0::MemoryBlock; | ||
21 | |||
19 | interface IMemoryTest { | 22 | interface IMemoryTest { |
20 | haveSomeMemory(memory mem) generates(memory mem); | 23 | haveSomeMemory(memory mem) generates(memory mem); |
21 | fillMemory(memory memory_in, uint8_t filler); | 24 | fillMemory(memory memory_in, uint8_t filler); |
25 | haveSomeMemoryBlock(MemoryBlock blk) generates(MemoryBlock blk); | ||
26 | set(memory mem) generates(); | ||
27 | get()generates(IMemoryToken token); | ||
22 | }; | 28 | }; |
diff --git a/tests/memory/1.0/default/Android.bp b/tests/memory/1.0/default/Android.bp index 985183bc..3f136340 100644 --- a/tests/memory/1.0/default/Android.bp +++ b/tests/memory/1.0/default/Android.bp | |||
@@ -28,6 +28,7 @@ cc_library { | |||
28 | "liblog", | 28 | "liblog", |
29 | "libutils", | 29 | "libutils", |
30 | "android.hidl.memory@1.0", | 30 | "android.hidl.memory@1.0", |
31 | "android.hidl.memory.token@1.0", | ||
31 | ], | 32 | ], |
32 | 33 | ||
33 | // These are static libs only for testing purposes and portability. Shared | 34 | // These are static libs only for testing purposes and portability. Shared |
diff --git a/tests/memory/1.0/default/MemoryTest.cpp b/tests/memory/1.0/default/MemoryTest.cpp index 37a2a606..5cbf67e1 100644 --- a/tests/memory/1.0/default/MemoryTest.cpp +++ b/tests/memory/1.0/default/MemoryTest.cpp | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #include <log/log.h> | 21 | #include <log/log.h> |
22 | 22 | ||
23 | #include <hidlmemory/HidlMemoryToken.h> | ||
23 | #include <hidlmemory/mapping.h> | 24 | #include <hidlmemory/mapping.h> |
24 | 25 | ||
25 | #include <android/hidl/memory/1.0/IMemory.h> | 26 | #include <android/hidl/memory/1.0/IMemory.h> |
@@ -60,6 +61,22 @@ Return<void> Memory::fillMemory(const hidl_memory& memory_in, uint8_t filler) { | |||
60 | return Void(); | 61 | return Void(); |
61 | } | 62 | } |
62 | 63 | ||
64 | Return<void> Memory::haveSomeMemoryBlock(const MemoryBlock& blk, haveSomeMemoryBlock_cb _hidl_cb) { | ||
65 | _hidl_cb(blk); | ||
66 | return Void(); | ||
67 | } | ||
68 | |||
69 | Return<void> Memory::set(const hidl_memory& mem) { | ||
70 | sp<HidlMemory> hidlMem = HidlMemory::getInstance(mem); | ||
71 | if (hidlMem->valid()) { | ||
72 | mSavedMemoryToken = new HidlMemoryToken(hidlMem); | ||
73 | } | ||
74 | return Void(); | ||
75 | } | ||
76 | |||
77 | Return<sp<IMemoryToken>> Memory::get() { | ||
78 | return mSavedMemoryToken; | ||
79 | } | ||
63 | 80 | ||
64 | IMemoryTest* HIDL_FETCH_IMemoryTest(const char* /* name */) { | 81 | IMemoryTest* HIDL_FETCH_IMemoryTest(const char* /* name */) { |
65 | return new Memory(); | 82 | return new Memory(); |
diff --git a/tests/memory/1.0/default/MemoryTest.h b/tests/memory/1.0/default/MemoryTest.h index 0d903f15..4c2ed36d 100644 --- a/tests/memory/1.0/default/MemoryTest.h +++ b/tests/memory/1.0/default/MemoryTest.h | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <android/hardware/tests/memory/1.0/IMemoryTest.h> | 20 | #include <android/hardware/tests/memory/1.0/IMemoryTest.h> |
21 | #include <hidl/MQDescriptor.h> | 21 | #include <hidl/MQDescriptor.h> |
22 | #include <hidl/Status.h> | 22 | #include <hidl/Status.h> |
23 | #include <hidlmemory/HidlMemoryToken.h> | ||
23 | 24 | ||
24 | namespace android { | 25 | namespace android { |
25 | namespace hardware { | 26 | namespace hardware { |
@@ -28,14 +29,17 @@ namespace memory { | |||
28 | namespace V1_0 { | 29 | namespace V1_0 { |
29 | namespace implementation { | 30 | namespace implementation { |
30 | 31 | ||
31 | using ::android::hardware::tests::memory::V1_0::IMemoryTest; | 32 | using ::android::sp; |
32 | using ::android::hardware::hidl_array; | 33 | using ::android::hardware::hidl_array; |
33 | using ::android::hardware::hidl_memory; | 34 | using ::android::hardware::hidl_memory; |
34 | using ::android::hardware::hidl_string; | 35 | using ::android::hardware::hidl_string; |
35 | using ::android::hardware::hidl_vec; | 36 | using ::android::hardware::hidl_vec; |
37 | using ::android::hardware::HidlMemoryToken; | ||
36 | using ::android::hardware::Return; | 38 | using ::android::hardware::Return; |
37 | using ::android::hardware::Void; | 39 | using ::android::hardware::Void; |
38 | using ::android::sp; | 40 | using ::android::hardware::tests::memory::V1_0::IMemoryTest; |
41 | using ::android::hidl::memory::block::V1_0::MemoryBlock; | ||
42 | using ::android::hidl::memory::token::V1_0::IMemoryToken; | ||
39 | 43 | ||
40 | struct Memory : public IMemoryTest { | 44 | struct Memory : public IMemoryTest { |
41 | // Methods from ::android::hardware::tests::memory::V1_0::IMemoryTest follow. | 45 | // Methods from ::android::hardware::tests::memory::V1_0::IMemoryTest follow. |
@@ -43,6 +47,14 @@ struct Memory : public IMemoryTest { | |||
43 | 47 | ||
44 | Return<void> fillMemory(const hidl_memory& memory_in, uint8_t filler) override; | 48 | Return<void> fillMemory(const hidl_memory& memory_in, uint8_t filler) override; |
45 | 49 | ||
50 | Return<void> haveSomeMemoryBlock(const MemoryBlock& blk, | ||
51 | haveSomeMemoryBlock_cb _hidl_cb) override; | ||
52 | Return<void> set(const ::android::hardware::hidl_memory& mem) override; | ||
53 | |||
54 | Return<sp<IMemoryToken>> get() override; | ||
55 | |||
56 | protected: | ||
57 | sp<HidlMemoryToken> mSavedMemoryToken; | ||
46 | }; | 58 | }; |
47 | 59 | ||
48 | extern "C" IMemoryTest* HIDL_FETCH_IMemoryTest(const char* name); | 60 | extern "C" IMemoryTest* HIDL_FETCH_IMemoryTest(const char* name); |