Merge branch 'bjorn/asn1/minor-fixes'

* bjorn/asn1/minor-fixes: (21 commits)
  Always inline decoding of open types
  Eliminate code duplication
  per: Slightly optimize encoding of fixed OCTET STRINGs
  per: Fix encoding of OCTET STRINGs with fixed length of 256 or more
  Remove support for the {Typename,Value} notation in encoding
  asn1ct_parser2: Let synonyms share parsing code
  Add a test case for constraint equivalence
  Make .abs file consultable
  Fix a bug in skipping of extensions
  asn1rt_uper_bin: Correct incorrect skipping of extensions
  asn1 doc: Remove a reference to a section that has been removed
  Simplify testConstraints by introducing helper functions
  Simplify testCompactBitString by introducing roundtrip functions
  Simplify testEnumExt by introducing a roundtrip/2 function
  Simplify testChoExternal by introducing a roundtrip/2 function
  Simplify testChoRecursive by introducing a roundtrip/2 function
  Simplify testSeqExtension.erl by introducing a roundtrip/2 function
  Simplify testChoExtension by introducing a roundtrip/2 function
  Simplify testSetOptional by introducing a roundtrip/2 function
  testSetOptional: Correct test case for decoding of corrupt data
  ...

1 files changed, 20 insertions, 55 deletions

diff --git a/lib/asn1/test/testChoExternal.erl b/lib/asn1/test/testChoExternal.erl
index b2d171f9c7..5fdee48add 100644
--- a/lib/asn1/test/testChoExternal.erl
+++ b/lib/asn1/test/testChoExternal.erl
@@ -38,62 +38,27 @@ compile(Config, Rules, Optimize) ->
 
 
 external(_Rules) ->
+    roundtrip('ChoXCho', {boolCho,true}),
+    roundtrip('ChoXCho', {intCho,77}),
 
-    ?line {ok,Bytes11} = asn1_wrapper:encode('ChoExternal','ChoXCho',{'ChoXCho',{boolCho,true}}),
-    ?line {ok,{boolCho,true}} = asn1_wrapper:decode('ChoExternal','ChoXCho',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('ChoExternal','ChoXCho',{'ChoXCho',{intCho,77}}),
-    ?line {ok,{intCho,77}} = asn1_wrapper:decode('ChoExternal','ChoXCho',lists:flatten(Bytes12)),
-    
-    
-    
-    ?line {ok,Bytes21} = asn1_wrapper:encode('ChoExternal','ChoXBool',{'ChoXBool',{xbool,true}}),
-    ?line {ok,{xbool,true}} = asn1_wrapper:decode('ChoExternal','ChoXBool',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('ChoExternal','ChoXBool',{'ChoXBool',{xboolImp,true}}),
-    ?line {ok,{xboolImp,true}} = asn1_wrapper:decode('ChoExternal','ChoXBool',lists:flatten(Bytes22)),
-    
-    
-    ?line {ok,Bytes23} = asn1_wrapper:encode('ChoExternal','ChoXBool',{'ChoXBool',{xboolExp,true}}),
-    ?line {ok,{xboolExp,true}} = asn1_wrapper:decode('ChoExternal','ChoXBool',lists:flatten(Bytes23)),
-    
-    
-    
-    ?line {ok,Bytes31} = asn1_wrapper:encode('ChoExternal','NT',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','NT',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('ChoExternal','Exp',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','Exp',lists:flatten(Bytes32)),
-    
-    ?line {ok,Bytes33} = asn1_wrapper:encode('ChoExternal','NTNT',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','NTNT',lists:flatten(Bytes33)),
-    
-    ?line {ok,Bytes34} = asn1_wrapper:encode('ChoExternal','NTExp',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','NTExp',lists:flatten(Bytes34)),
-    
-    ?line {ok,Bytes35} = asn1_wrapper:encode('ChoExternal','ExpNT',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','ExpNT',lists:flatten(Bytes35)),
-    
-    ?line {ok,Bytes36} = asn1_wrapper:encode('ChoExternal','ExpExp',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','ExpExp',lists:flatten(Bytes36)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes41} = asn1_wrapper:encode('ChoExternal','XNTNT',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','XNTNT',lists:flatten(Bytes41)),
-    
-    ?line {ok,Bytes42} = asn1_wrapper:encode('ChoExternal','XNTExp',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','XNTExp',lists:flatten(Bytes42)),
-    
-    ?line {ok,Bytes43} = asn1_wrapper:encode('ChoExternal','XExpNT',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','XExpNT',lists:flatten(Bytes43)),
-    
-    ?line {ok,Bytes44} = asn1_wrapper:encode('ChoExternal','XExpExp',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','XExpExp',lists:flatten(Bytes44)),
+    roundtrip('ChoXBool', {xbool,true}),
+    roundtrip('ChoXBool', {xboolImp,true}),
+    roundtrip('ChoXBool', {xboolExp,true}),
+
+    roundtrip('NT', {os,"kalle"}),
+    roundtrip('Exp', {os,"kalle"}),
+    roundtrip('NTNT', {os,"kalle"}),
+    roundtrip('NTExp', {os,"kalle"}),
+    roundtrip('ExpNT', {os,"kalle"}),
+    roundtrip('ExpExp', {os,"kalle"}),
+    roundtrip('XNTNT', {os,"kalle"}),
+    roundtrip('XNTExp', {os,"kalle"}),
+    roundtrip('XExpNT', {os,"kalle"}),
+    roundtrip('XExpExp', {os,"kalle"}),
     
     ok.
 
+roundtrip(Type, Value) ->
+    {ok,Encoded} = 'ChoExternal':encode(Type, Value),
+    {ok,Value} = 'ChoExternal':decode(Type, Encoded),
+    ok.