summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorNirav Atre2018-07-07 21:31:21 -0500
committerNirav Atre2018-07-07 21:31:21 -0500
commit0534690fa6513e59bf2fc0fe13b91be8b4db05b4 (patch)
tree683f811f64d9603a2dd00c45b0b512eb8d3c8903 /tests
parent5f64ae9872edb5967e565fd1fe8dffaaee3054e2 (diff)
downloadplatform-hardware-interfaces-0534690fa6513e59bf2fc0fe13b91be8b4db05b4.tar.gz
platform-hardware-interfaces-0534690fa6513e59bf2fc0fe13b91be8b4db05b4.tar.xz
platform-hardware-interfaces-0534690fa6513e59bf2fc0fe13b91be8b4db05b4.zip
Make safeunion@1.0 test HAL Java-compatible
This change removes Java-incompatible types (memory, handle) from the safeunion@1.0 test HAL. Moving forward, the idea is to keep this HAL Java & C++-friendly, and create another version (likely safeunion@2.0) to regress on C++-only types; tracked by b/110269925. Bug: n/a Test: Ran the existing hidl_test suite Change-Id: Ic7458c3f5b571e77e5f894a9854a2b201f53fe18
Diffstat (limited to 'tests')
-rw-r--r--tests/safeunion/1.0/Android.bp2
-rw-r--r--tests/safeunion/1.0/ISafeUnion.hal13
-rw-r--r--tests/safeunion/1.0/default/SafeUnion.cpp38
-rw-r--r--tests/safeunion/1.0/default/SafeUnion.h5
4 files changed, 1 insertions, 57 deletions
diff --git a/tests/safeunion/1.0/Android.bp b/tests/safeunion/1.0/Android.bp
index 4c6631ee..ede84018 100644
--- a/tests/safeunion/1.0/Android.bp
+++ b/tests/safeunion/1.0/Android.bp
@@ -10,6 +10,6 @@ hidl_interface {
10 interfaces: [ 10 interfaces: [
11 "android.hidl.base@1.0", 11 "android.hidl.base@1.0",
12 ], 12 ],
13 gen_java: false, 13 gen_java: true,
14} 14}
15 15
diff --git a/tests/safeunion/1.0/ISafeUnion.hal b/tests/safeunion/1.0/ISafeUnion.hal
index 153d6f4f..fedd63b8 100644
--- a/tests/safeunion/1.0/ISafeUnion.hal
+++ b/tests/safeunion/1.0/ISafeUnion.hal
@@ -62,14 +62,6 @@ interface ISafeUnion {
62 SmallSafeUnion l; 62 SmallSafeUnion l;
63 }; 63 };
64 64
65 // TODO(b/110269925): Test more HIDL types. Missing:
66 // death_recipient, fmq_{sync,unsync}, pointer, ref.
67 safe_union MiscTypesSafeUnion {
68 memory a;
69 handle b;
70 bitfield<BitField> c;
71 };
72
73 safe_union InterfaceTypeSafeUnion { 65 safe_union InterfaceTypeSafeUnion {
74 uint32_t a; 66 uint32_t a;
75 int8_t[7] b; 67 int8_t[7] b;
@@ -90,11 +82,6 @@ interface ISafeUnion {
90 setK(LargeSafeUnion myUnion, LargeSafeUnion.K k) generates (LargeSafeUnion myUnion); 82 setK(LargeSafeUnion myUnion, LargeSafeUnion.K k) generates (LargeSafeUnion myUnion);
91 setL(LargeSafeUnion myUnion, SmallSafeUnion l) generates (LargeSafeUnion myUnion); 83 setL(LargeSafeUnion myUnion, SmallSafeUnion l) generates (LargeSafeUnion myUnion);
92 84
93 newMiscTypesSafeUnion() generates (MiscTypesSafeUnion myUnion);
94 setMiscA(MiscTypesSafeUnion myUnion, memory a) generates (MiscTypesSafeUnion myUnion);
95 setMiscB(MiscTypesSafeUnion myUnion, handle b) generates (MiscTypesSafeUnion myUnion);
96 setMiscC(MiscTypesSafeUnion myUnion, bitfield<BitField> c) generates (MiscTypesSafeUnion myUnion);
97
98 newInterfaceTypeSafeUnion() generates (InterfaceTypeSafeUnion myUnion); 85 newInterfaceTypeSafeUnion() generates (InterfaceTypeSafeUnion myUnion);
99 setInterfaceA(InterfaceTypeSafeUnion myUnion, uint32_t a) generates (InterfaceTypeSafeUnion myUnion); 86 setInterfaceA(InterfaceTypeSafeUnion myUnion, uint32_t a) generates (InterfaceTypeSafeUnion myUnion);
100 setInterfaceB(InterfaceTypeSafeUnion myUnion, int8_t[7] b) generates (InterfaceTypeSafeUnion myUnion); 87 setInterfaceB(InterfaceTypeSafeUnion myUnion, int8_t[7] b) generates (InterfaceTypeSafeUnion myUnion);
diff --git a/tests/safeunion/1.0/default/SafeUnion.cpp b/tests/safeunion/1.0/default/SafeUnion.cpp
index 55d20f80..7047d161 100644
--- a/tests/safeunion/1.0/default/SafeUnion.cpp
+++ b/tests/safeunion/1.0/default/SafeUnion.cpp
@@ -153,44 +153,6 @@ Return<void> SafeUnion::setL(const LargeSafeUnion& myUnion, const SmallSafeUnion
153 return Void(); 153 return Void();
154} 154}
155 155
156Return<void> SafeUnion::newMiscTypesSafeUnion(newMiscTypesSafeUnion_cb _hidl_cb) {
157 LOG(INFO) << "SERVER(SafeUnion) newMiscTypesSafeUnion()";
158
159 MiscTypesSafeUnion ret;
160 _hidl_cb(ret);
161 return Void();
162}
163
164Return<void> SafeUnion::setMiscA(const MiscTypesSafeUnion& myUnion, const hidl_memory& a, setMiscA_cb _hidl_cb) {
165 LOG(INFO) << "SERVER(SafeUnion) setMiscA(myUnion, " << toString(a) << ")";
166
167 MiscTypesSafeUnion myNewUnion = myUnion;
168 myNewUnion.a(a);
169
170 _hidl_cb(myNewUnion);
171 return Void();
172}
173
174Return<void> SafeUnion::setMiscB(const MiscTypesSafeUnion& myUnion, const hidl_handle& b, setMiscB_cb _hidl_cb) {
175 LOG(INFO) << "SERVER(SafeUnion) setMiscB(myUnion, " << toString(b) << ")";
176
177 MiscTypesSafeUnion myNewUnion = myUnion;
178 myNewUnion.b(b);
179
180 _hidl_cb(myNewUnion);
181 return Void();
182}
183
184Return<void> SafeUnion::setMiscC(const MiscTypesSafeUnion& myUnion, hidl_bitfield<BitField> c, setMiscC_cb _hidl_cb) {
185 LOG(INFO) << "SERVER(SafeUnion) setMiscC(myUnion, " << c << ")";
186
187 MiscTypesSafeUnion myNewUnion = myUnion;
188 myNewUnion.c(c);
189
190 _hidl_cb(myNewUnion);
191 return Void();
192}
193
194Return<void> SafeUnion::newInterfaceTypeSafeUnion(newInterfaceTypeSafeUnion_cb _hidl_cb) { 156Return<void> SafeUnion::newInterfaceTypeSafeUnion(newInterfaceTypeSafeUnion_cb _hidl_cb) {
195 LOG(INFO) << "SERVER(SafeUnion) newInterfaceTypeSafeUnion()"; 157 LOG(INFO) << "SERVER(SafeUnion) newInterfaceTypeSafeUnion()";
196 158
diff --git a/tests/safeunion/1.0/default/SafeUnion.h b/tests/safeunion/1.0/default/SafeUnion.h
index e3550b8a..07d88d23 100644
--- a/tests/safeunion/1.0/default/SafeUnion.h
+++ b/tests/safeunion/1.0/default/SafeUnion.h
@@ -48,11 +48,6 @@ struct SafeUnion : public ISafeUnion {
48 Return<void> setK(const LargeSafeUnion& myUnion, const LargeSafeUnion::K& k, setK_cb _hidl_cb) override; 48 Return<void> setK(const LargeSafeUnion& myUnion, const LargeSafeUnion::K& k, setK_cb _hidl_cb) override;
49 Return<void> setL(const LargeSafeUnion& myUnion, const SmallSafeUnion& l, setL_cb _hidl_cb) override; 49 Return<void> setL(const LargeSafeUnion& myUnion, const SmallSafeUnion& l, setL_cb _hidl_cb) override;
50 50
51 Return<void> newMiscTypesSafeUnion(newMiscTypesSafeUnion_cb _hidl_cb) override;
52 Return<void> setMiscA(const MiscTypesSafeUnion& myUnion, const hidl_memory& a, setMiscA_cb _hidl_cb) override;
53 Return<void> setMiscB(const MiscTypesSafeUnion& myUnion, const hidl_handle& b, setMiscB_cb _hidl_cb) override;
54 Return<void> setMiscC(const MiscTypesSafeUnion& myUnion, hidl_bitfield<BitField> c, setMiscC_cb _hidl_cb) override;
55
56 Return<void> newInterfaceTypeSafeUnion(newInterfaceTypeSafeUnion_cb _hidl_cb) override; 51 Return<void> newInterfaceTypeSafeUnion(newInterfaceTypeSafeUnion_cb _hidl_cb) override;
57 Return<void> setInterfaceA(const InterfaceTypeSafeUnion& myUnion, uint32_t a, setInterfaceA_cb _hidl_cb) override; 52 Return<void> setInterfaceA(const InterfaceTypeSafeUnion& myUnion, uint32_t a, setInterfaceA_cb _hidl_cb) override;
58 Return<void> setInterfaceB(const InterfaceTypeSafeUnion& myUnion, const hidl_array<int8_t, 7>& b, setInterfaceB_cb _hidl_cb) override; 53 Return<void> setInterfaceB(const InterfaceTypeSafeUnion& myUnion, const hidl_array<int8_t, 7>& b, setInterfaceB_cb _hidl_cb) override;