diff options
author | Jens Geyer <jensg@apache.org> | 2014-10-07 21:16:20 +0200 |
---|---|---|
committer | Jens Geyer <jensg@apache.org> | 2014-10-07 21:17:10 +0200 |
commit | dd971d5377c3e0271ffb9692217196274a8e02e4 (patch) | |
tree | a74c90b921fddaef0397a87d0e905df47e9f395e /test | |
parent | 196c5afbb1dcd9f815c055e76b3603bb9acccbb4 (diff) | |
download | thrift-dd971d5377c3e0271ffb9692217196274a8e02e4.tar.gz |
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
Diffstat (limited to 'test')
-rw-r--r-- | test/NameConflictTest.thrift | 9 | ||||
-rw-r--r-- | test/erl/src/name_conflict_test.erl | 26 |
2 files changed, 0 insertions, 35 deletions
diff --git a/test/NameConflictTest.thrift b/test/NameConflictTest.thrift index 337be07e7..e5140ddd6 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 diff --git a/test/erl/src/name_conflict_test.erl b/test/erl/src/name_conflict_test.erl index 40c820410..a38eff088 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}, |