diff options
author | Howard Chen <howardsoc@google.com> | 2018-01-03 15:54:55 +0800 |
---|---|---|
committer | Howard Chen <howardsoc@google.com> | 2018-01-03 17:16:58 +0800 |
commit | 0cd07d214bcf92a35b78a2066fe835ed018450b9 (patch) | |
tree | 4f50ee5ade0f0f32c6c45ed957e67dea9886d8c6 /tests | |
parent | 718b51008095493e2ba0f2a0e3b98d1b2decd794 (diff) | |
download | android_hardware_interfaces-0cd07d214bcf92a35b78a2066fe835ed018450b9.tar.gz android_hardware_interfaces-0cd07d214bcf92a35b78a2066fe835ed018450b9.tar.bz2 android_hardware_interfaces-0cd07d214bcf92a35b78a2066fe835ed018450b9.zip |
Add a test method to test interface in struct
Add a test method to IBaz to test struct with a composed interface
Test: hidl_test_java/ internal master
Bug: 70529597
Change-Id: I73eaaf3dda6a24b88207729f31c75454c005c8cf
Diffstat (limited to 'tests')
-rw-r--r-- | tests/baz/1.0/IBaz.hal | 6 | ||||
-rw-r--r-- | tests/baz/1.0/default/Baz.cpp | 6 | ||||
-rw-r--r-- | tests/baz/1.0/default/Baz.h | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/tests/baz/1.0/IBaz.hal b/tests/baz/1.0/IBaz.hal index 8c6a9a45d..9a9e75451 100644 --- a/tests/baz/1.0/IBaz.hal +++ b/tests/baz/1.0/IBaz.hal @@ -68,6 +68,10 @@ interface IBaz extends IBase { bitfield<BitField> bf; }; + struct StructWithInterface { + int32_t number; + IBase dummy; + }; oneway doThis(float param); doThatAndReturnSomething(int64_t param) generates (int32_t result); @@ -93,4 +97,6 @@ interface IBaz extends IBase { size(uint32_t size) generates (uint32_t size); getNestedStructs() generates(vec<NestedStruct> data); + + haveSomeStructWithInterface(StructWithInterface swi) generates(StructWithInterface swi); }; diff --git a/tests/baz/1.0/default/Baz.cpp b/tests/baz/1.0/default/Baz.cpp index 5ccd87b44..e118122eb 100644 --- a/tests/baz/1.0/default/Baz.cpp +++ b/tests/baz/1.0/default/Baz.cpp @@ -394,6 +394,12 @@ Return<void> Baz::getNestedStructs(getNestedStructs_cb _hidl_cb) { _hidl_cb(result); return Void(); } + +Return<void> Baz::haveSomeStructWithInterface(const StructWithInterface& swi, + haveSomeStructWithInterface_cb _hidl_cb) { + _hidl_cb(swi); + return Void(); +} // Methods from ::android::hidl::base::V1_0::IBase follow. IBaz* HIDL_FETCH_IBaz(const char* /* name */) { diff --git a/tests/baz/1.0/default/Baz.h b/tests/baz/1.0/default/Baz.h index 4443587b2..c264f47a7 100644 --- a/tests/baz/1.0/default/Baz.h +++ b/tests/baz/1.0/default/Baz.h @@ -91,6 +91,8 @@ struct Baz : public IBaz { Return<uint32_t> size(uint32_t size) override; Return<void> getNestedStructs(getNestedStructs_cb _hidl_cb) override; + Return<void> haveSomeStructWithInterface(const StructWithInterface& swi, + haveSomeStructWithInterface_cb _hidl_cb) override; // Methods from ::android::hidl::base::V1_0::IBase follow. private: sp<IBazCallback> mStoredCallback; |