You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by he...@apache.org on 2015/02/05 02:41:08 UTC
thrift git commit: THRIFT-2951 Fix Erlang name conflict test Patch:
Nobuaki Sukegawa
Repository: thrift
Updated Branches:
refs/heads/master a7270074d -> 2f34da702
THRIFT-2951 Fix Erlang name conflict test
Patch: Nobuaki Sukegawa
This closes #360
----
commit 06cc3e990ade560461a276991ce9cb544706dae3
Author: Nobuaki Sukegawa <ns...@gmail.com>
Date: 2015-01-27T18:11:40Z
THRIFT-2951 Fix Erlang name conflict test
----
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/2f34da70
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/2f34da70
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/2f34da70
Branch: refs/heads/master
Commit: 2f34da70243675c4d8e04f368522046fe99dcb50
Parents: a727007
Author: henrique <he...@apache.org>
Authored: Thu Feb 5 12:39:34 2015 +1100
Committer: henrique <he...@apache.org>
Committed: Thu Feb 5 12:39:34 2015 +1100
----------------------------------------------------------------------
test/NameConflictTest.thrift | 4 ++--
test/erl/src/name_conflict_test.erl | 12 +++++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/2f34da70/test/NameConflictTest.thrift
----------------------------------------------------------------------
diff --git a/test/NameConflictTest.thrift b/test/NameConflictTest.thrift
index e0d351c..d3efb47 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 {
http://git-wip-us.apache.org/repos/asf/thrift/blob/2f34da70/test/erl/src/name_conflict_test.erl
----------------------------------------------------------------------
diff --git a/test/erl/src/name_conflict_test.erl b/test/erl/src/name_conflict_test.erl
index a38eff0..5576ffa 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)
)},