Repository: thrift Updated Branches: refs/heads/master 196c5afbb -> dd971d537
THRIFT-2689 struct names that differ only in capitalization of first character generate broken erlang code Client: haskell Patch: Alisdair Sullivan This closes #239 Removed struct from NameConflictTest.thrift that causes problems for certain backends Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/dd971d53 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/dd971d53 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/dd971d53 Branch: refs/heads/master Commit: dd971d5377c3e0271ffb9692217196274a8e02e4 Parents: 196c5af Author: Jens Geyer <[email protected]> Authored: Tue Oct 7 21:16:20 2014 +0200 Committer: Jens Geyer <[email protected]> Committed: Tue Oct 7 21:17:10 2014 +0200 ---------------------------------------------------------------------- test/NameConflictTest.thrift | 9 --------- test/erl/src/name_conflict_test.erl | 26 -------------------------- 2 files changed, 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/dd971d53/test/NameConflictTest.thrift ---------------------------------------------------------------------- diff --git a/test/NameConflictTest.thrift b/test/NameConflictTest.thrift index 337be07..e5140dd 100644 --- a/test/NameConflictTest.thrift +++ b/test/NameConflictTest.thrift @@ -76,15 +76,6 @@ struct TheEdgeCase { 6: bool TheEdgeCase__ } -struct theEdgeCase { - 1: bool theEdgeCase - 2: bool theEdgeCase_ - 3: bool theEdgeCase__ - 4: bool TheEdgeCase - 5: bool TheEdgeCase_ - 6: bool TheEdgeCase__ -} - struct Tricky_ { 1: bool tricky 2: bool Tricky http://git-wip-us.apache.org/repos/asf/thrift/blob/dd971d53/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 40c8204..a38eff0 100644 --- a/test/erl/src/name_conflict_test.erl +++ b/test/erl/src/name_conflict_test.erl @@ -80,17 +80,6 @@ record_generation_test_() -> 'TheEdgeCase__'=null } )}, - {"theEdgeCase record", ?_assertMatch( - {theEdgeCase, _, _, _, _, _, _}, - #theEdgeCase{ - theEdgeCase=null, - theEdgeCase_=null, - theEdgeCase__=null, - 'TheEdgeCase'=null, - 'TheEdgeCase_'=null, - 'TheEdgeCase__'=null - } - )}, {"Tricky_ record", ?_assertMatch( {'Tricky_', _, _}, #'Tricky_'{tricky=null,'Tricky'=null} @@ -149,10 +138,6 @@ struct_info_test_() -> {struct, [{1, bool},{2, bool},{3, bool},{4, bool},{5, bool},{6, bool}]}, name_conflict_test_types:struct_info('TheEdgeCase') )}, - {"theEdgeCase definition", ?_assertEqual( - {struct, [{1, bool},{2, bool},{3, bool},{4, bool},{5, bool},{6, bool}]}, - name_conflict_test_types:struct_info(theEdgeCase) - )}, {"Tricky_ definition", ?_assertEqual( {struct, [{1, bool},{2, bool}]}, name_conflict_test_types:struct_info('Tricky_') @@ -234,17 +219,6 @@ struct_info_test_() -> ]}, name_conflict_test_types:struct_info_ext('TheEdgeCase') )}, - {"TheEdgeCase extended definition", ?_assertEqual( - {struct, [ - {1, undefined, bool, theEdgeCase, undefined}, - {2, undefined, bool, theEdgeCase_, undefined}, - {3, undefined, bool, theEdgeCase__, undefined}, - {4, undefined, bool, 'TheEdgeCase', undefined}, - {5, undefined, bool, 'TheEdgeCase_', undefined}, - {6, undefined, bool, 'TheEdgeCase__', undefined} - ]}, - name_conflict_test_types:struct_info_ext(theEdgeCase) - )}, {"Tricky_ extended definition", ?_assertEqual( {struct, [ {1, undefined, bool, tricky, undefined},
