diff options
| author | Yifan Hong <elsk@google.com> | 2017-02-27 18:52:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-27 18:52:28 +0000 |
| commit | 77c34e94c9d09ed538edb08ded53e1de46b6fb4a (patch) | |
| tree | 5561e0aee608f2d45e7d5d877609a8af9a344dbd | |
| parent | 5c605c8add13ab7d3a7ef4ab5bb7ed5ae78c0871 (diff) | |
| parent | cc51d3b2ae39cc8e4e2d7ab6aeb5f5f17e60ae24 (diff) | |
Merge "Add tests for .equals and toString" am: 7128746a9f
am: cc51d3b2ae
Change-Id: I6d9393a4822eab544d6cf97e63691090e4f31e94
| -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 40e4024c9c..e4eb1451f8 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 76aefcf6c2..a43b883c50 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 { |