diff options
| author | Björn Gustavsson <[email protected]> | 2015-03-12 09:59:02 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-03-12 09:59:02 +0100 |
| commit | 0796cb716511ae2bf35ee0ee1e0da75f20ad567f (patch) | |
| tree | 7b9639f88316cac2dfb8c870ae6b019deec453c4 /lib/asn1/test/testDoubleEllipses.erl | |
| parent | 47c44f3de3d5bf4251c35cf49474c3e29ad2933b (diff) | |
| parent | e073ffc39c29dcec5dec0a0af070952e03c1fa8f (diff) | |
| download | otp-0796cb716511ae2bf35ee0ee1e0da75f20ad567f.tar.gz otp-0796cb716511ae2bf35ee0ee1e0da75f20ad567f.tar.bz2 otp-0796cb716511ae2bf35ee0ee1e0da75f20ad567f.zip | |
Merge branch 'bjorn/asn1/double-ellipses/OTP-12546' into maint
* bjorn/asn1/double-ellipses/OTP-12546:
asn1ct_gen: Correct generation of .hrl files for multiple ellipses
Fix BER code generation
Diffstat (limited to 'lib/asn1/test/testDoubleEllipses.erl')
| -rw-r--r-- | lib/asn1/test/testDoubleEllipses.erl | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/asn1/test/testDoubleEllipses.erl b/lib/asn1/test/testDoubleEllipses.erl index 4e8972cdfc..bd6831bf1e 100644 --- a/lib/asn1/test/testDoubleEllipses.erl +++ b/lib/asn1/test/testDoubleEllipses.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2013. All Rights Reserved. +%% Copyright Ericsson AB 2007-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -24,17 +24,20 @@ -include_lib("test_server/include/test_server.hrl"). -record('Seq',{a, c}). +-record('SeqV1',{a, b}). -record('SeqV2',{a, b ,c}). -record('SeqAlt',{a,d,b,e,c,f,g}). -record('SeqAltV2',{a,d,b,e,h,i,c,f,g}). -record('Set',{a, c}). +-record('SetV1',{a, b}). -record('SetV2',{a, b ,c}). -record('SetAlt',{a,d,b,e,c,f,g}). -record('SetAltV2',{a,d,b,e,h,i,c,f,g}). main(_Rules) -> roundtrip('Seq', #'Seq'{a=10,c=true}), + roundtrip('SeqV1', #'SeqV1'{a=10,b=false}), roundtrip('SeqV2', #'SeqV2'{a=10,b=false,c=true}), roundtrip('SeqAlt', #'SeqAlt'{a=10,d=12,b = <<2#1010:4>>, @@ -45,6 +48,7 @@ main(_Rules) -> e=true,h="PS",i=13,c=false,f=14,g=16}), roundtrip('Set', #'Set'{a=10,c=true}), + roundtrip('SetV1', #'SetV1'{a=10,b=false}), roundtrip('SetV2', #'SetV2'{a=10,b=false,c=true}), roundtrip('SetAlt', #'SetAlt'{a=10,d=12, @@ -54,6 +58,14 @@ main(_Rules) -> #'SetAltV2'{a=10,d=12, b = <<2#1010:4>>, e=true,h="PS",i=13,c=false,f=14,g=16}), + + roundtrip('SeqDoubleEmpty1', + {'SeqDoubleEmpty1'}), + roundtrip('SeqDoubleEmpty2', + {'SeqDoubleEmpty2',true,42}), + roundtrip('SeqDoubleEmpty2', + {'SeqDoubleEmpty2',true,asn1_NOVALUE}), + ok. roundtrip(T, V) -> |