diff options
| author | Yifan Hong <elsk@google.com> | 2017-02-27 18:56:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-27 18:56:13 +0000 |
| commit | 2c5e21c69c931a90dcb9b4ea893157be17eaf8d5 (patch) | |
| tree | d77094f7eb3e6296f567a4498112ccf0d8348e55 /tests | |
| parent | 2d4681b397c3d15e66bed2734ec4c17817e699de (diff) | |
| parent | 77c34e94c9d09ed538edb08ded53e1de46b6fb4a (diff) | |
| download | android_hardware_interfaces-2c5e21c69c931a90dcb9b4ea893157be17eaf8d5.tar.gz android_hardware_interfaces-2c5e21c69c931a90dcb9b4ea893157be17eaf8d5.tar.bz2 android_hardware_interfaces-2c5e21c69c931a90dcb9b4ea893157be17eaf8d5.zip | |
Merge "Add tests for .equals and toString" am: 7128746a9f am: cc51d3b2ae
am: 77c34e94c9
Change-Id: If4ba94ff09f9160727befc47f09eaed0d7a8af64
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/baz/1.0/IBaz.hal | 23 | ||||
| -rw-r--r-- | tests/foo/1.0/IFoo.hal | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/tests/baz/1.0/IBaz.hal b/tests/baz/1.0/IBaz.hal index 40e4024c9..e4eb1451f 100644 --- a/tests/baz/1.0/IBaz.hal +++ b/tests/baz/1.0/IBaz.hal @@ -21,6 +21,14 @@ import IBazCallback; interface IBaz extends IBase { + enum BitField : uint8_t { + V0 = 1 << 0, + V1 = 1 << 1, + V2 = 1 << 2, + V3 = 1 << 3, + VALL = V0 | V1 | V2 | V3, + }; + enum SomeOtherEnum : uint8_t { bar = 66 }; @@ -45,6 +53,21 @@ interface IBaz extends IBase { vec<T> matrices; }; + struct Quux { + string first; + string last; + }; + struct Everything { + int8_t number; + int32_t anotherNumber; + string s; + vec<string> vs; + string[2][2] multidimArray; + string[3] sArray; + Quux anotherStruct; + bitfield<BitField> bf; + }; + @Fragile @NoReally(very="yes", array={"a","b","c"}) oneway doThis(float param); diff --git a/tests/foo/1.0/IFoo.hal b/tests/foo/1.0/IFoo.hal index 76aefcf6c..a43b883c5 100644 --- a/tests/foo/1.0/IFoo.hal +++ b/tests/foo/1.0/IFoo.hal @@ -38,6 +38,7 @@ interface IFoo { V1 = 1 << 1, V2 = 1 << 2, V3 = 1 << 3, + VALL = V0 | V1 | V2 | V3, }; struct Fumble { |