diff options
| author | henrique <henrique@apache.org> | 2015-02-05 12:39:34 +1100 |
|---|---|---|
| committer | henrique <henrique@apache.org> | 2015-02-05 12:39:34 +1100 |
| commit | 2f34da70243675c4d8e04f368522046fe99dcb50 (patch) | |
| tree | 5eaf9c5b749a60593609103f5771e7ca2ee5cafe | |
| parent | a7270074d31a25cd5e3965db7013446ac5d21c52 (diff) | |
| download | thrift-2f34da70243675c4d8e04f368522046fe99dcb50.tar.gz | |
THRIFT-2951 Fix Erlang name conflict test
Patch: Nobuaki Sukegawa
This closes #360
----
commit 06cc3e990ade560461a276991ce9cb544706dae3
Author: Nobuaki Sukegawa <nsukeg@gmail.com>
Date: 2015-01-27T18:11:40Z
THRIFT-2951 Fix Erlang name conflict test
----
| -rw-r--r-- | test/NameConflictTest.thrift | 4 | ||||
| -rw-r--r-- | test/erl/src/name_conflict_test.erl | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/test/NameConflictTest.thrift b/test/NameConflictTest.thrift index e0d351c1e..d3efb474c 100644 --- a/test/NameConflictTest.thrift +++ b/test/NameConflictTest.thrift @@ -19,8 +19,8 @@ struct get { struct partial { 1: using using - 2: bool read - 3: bool write + 2: bool read + 3: bool write } enum Maybe { diff --git a/test/erl/src/name_conflict_test.erl b/test/erl/src/name_conflict_test.erl index a38eff088..5576ffaf0 100644 --- a/test/erl/src/name_conflict_test.erl +++ b/test/erl/src/name_conflict_test.erl @@ -39,7 +39,7 @@ record_generation_test_() -> #get{sbyte=null} )}, {"partial record", ?_assertMatch( - {partial, _}, + {partial, _, _, _}, #partial{using=null} )}, {"ClassAndProp record", ?_assertMatch( @@ -119,7 +119,11 @@ struct_info_test_() -> name_conflict_test_types:struct_info(get) )}, {"partial definition", ?_assertEqual( - {struct, [{1, {struct, {name_conflict_test_types, using}}}]}, + {struct, [ + {1, {struct, {name_conflict_test_types, using}}}, + {2, bool}, + {3, bool} + ]}, name_conflict_test_types:struct_info(partial) )}, {"ClassAndProp definition", ?_assertEqual( @@ -177,7 +181,9 @@ struct_info_test_() -> )}, {"partial extended definition", ?_assertEqual( {struct, [ - {1, undefined, {struct, {name_conflict_test_types, using}}, using, #using{}} + {1, undefined, {struct, {name_conflict_test_types, using}}, using, #using{}}, + {2, undefined, bool, read, undefined}, + {3, undefined, bool, write, undefined} ]}, name_conflict_test_types:struct_info_ext(partial) )}, |