diff options
| author | Dan Gudmundsson <[email protected]> | 2014-11-27 10:22:56 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-11-27 10:22:56 +0100 |
| commit | 048ee9e06afb36d1711b824d1786400b287256f0 (patch) | |
| tree | 24bd377eeb78fd282d9095d8a8b688aa25430e65 /lib/asn1/test | |
| parent | aca180838c407296613c944dd6cd4df3fa1fe708 (diff) | |
| parent | 00d216799845f2a38dfb71ad0979c5bcab74c696 (diff) | |
| download | otp-048ee9e06afb36d1711b824d1786400b287256f0.tar.gz otp-048ee9e06afb36d1711b824d1786400b287256f0.tar.bz2 otp-048ee9e06afb36d1711b824d1786400b287256f0.zip | |
Merge branch 'dgud/asn1/fix-seqtag/OTP-12326' into maint
* dgud/asn1/fix-seqtag/OTP-12326:
asn1: Fix EXTERNAL (1994 variant) type conversion
Diffstat (limited to 'lib/asn1/test')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/ContextSwitchingTypes.asn1 | 4 | ||||
| -rw-r--r-- | lib/asn1/test/testContextSwitchingTypes.erl | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/lib/asn1/test/asn1_SUITE_data/ContextSwitchingTypes.asn1 b/lib/asn1/test/asn1_SUITE_data/ContextSwitchingTypes.asn1 index c8145bad63..e279a180c1 100644 --- a/lib/asn1/test/asn1_SUITE_data/ContextSwitchingTypes.asn1 +++ b/lib/asn1/test/asn1_SUITE_data/ContextSwitchingTypes.asn1 @@ -21,6 +21,10 @@ val3-T T ::= {identification context-negotiation:{presentation-context-id 12, transfer-syntax {1 2 3}}, data-value '123'H} +val4-T T ::= {identification presentation-context-id:42, + data-value-descriptor "FooBar", + data-value '123'H} + -- EMBEDDED PDV type EP ::= EMBEDDED PDV diff --git a/lib/asn1/test/testContextSwitchingTypes.erl b/lib/asn1/test/testContextSwitchingTypes.erl index bdd6883dac..61d1fbdd69 100644 --- a/lib/asn1/test/testContextSwitchingTypes.erl +++ b/lib/asn1/test/testContextSwitchingTypes.erl @@ -24,11 +24,21 @@ -include_lib("test_server/include/test_server.hrl"). test(Config) -> - ValT = 'ContextSwitchingTypes':'val1-T'(), - check_EXTERNAL(enc_dec('T', ValT)), + ValT_1 = 'ContextSwitchingTypes':'val1-T'(), + check_EXTERNAL(enc_dec('T', ValT_1)), + + ValT_2 = 'ContextSwitchingTypes':'val2-T'(), + check_EXTERNAL(enc_dec('T', ValT_2)), + + ValT_3 = 'ContextSwitchingTypes':'val3-T'(), + check_EXTERNAL(enc_dec('T', ValT_3)), + + ValT_4 = 'ContextSwitchingTypes':'val4-T'(), + check_EXTERNAL(enc_dec('T', ValT_4)), {ok,ValT2} = asn1ct:value('ContextSwitchingTypes', 'T', [{i,?config(case_dir, Config)}]), + io:format("ValT2 ~p~n",[ValT2]), check_EXTERNAL(enc_dec('T', ValT2)), ValEP = 'ContextSwitchingTypes':'val1-EP'(), |