Merge branch 'maint'

* maint: (24 commits)
  No longer compile the X420 specs for plain BER
  Combine the testSeqIndefinite/1 and testSetIndefinite/1 test cases
  Remove asn1_wrapper
  Eliminate the use of asn1_wrapper
  Simplify tests of CHOICE with OPTIONAL
  asn1_test_lib: Add roundtrip functions and use them everywhere
  Makefile: Release Emakefile to ensure warnings are treated as errors
  Don't allow unused exported functions in test case helpers
  Move out specific tests from asn1_test_lib
  testMegaco: Remove unused exported function msg11/0
  ASN.1 tests: Don't export functions that are only locally called
  Remove unused pem_performance.erl file
  asn1_SUITE: Reinstate test of sub-constraint
  ASN.1 tests: Remove unused choice_extension.erl
  Remove unused compile() functions
  asn1_test_lib: Remove unnecessary loading of a compiled ASN.1 spec
  Slightly clean up testX420
  asn1_SUITE: Combine most tests that use External.asn1
  asn1ct_gen: Clean up process dictionary after generating
  asn1ct_parser2: Clean the process dictionary after parsing
  ...

1 files changed, 38 insertions, 112 deletions

diff --git a/lib/asn1/test/testSetOfCho.erl b/lib/asn1/test/testSetOfCho.erl
index c89bf9596e..09c075e468 100644
--- a/lib/asn1/test/testSetOfCho.erl
+++ b/lib/asn1/test/testSetOfCho.erl
@@ -30,120 +30,46 @@
 -record('SetOfChoEmbDef_SETOF',{bool1, int1, set1 = asn1_DEFAULT}).
 -record('SetOfChoEmbOpt_SETOF',{bool1, int1, set1 = asn1_NOVALUE}).
 
+main(_Rules) ->
+    roundtrip('SetChoDef',
+	      #'SetChoDef'{bool1=true,int1=17,set1=asn1_DEFAULT},
+	      #'SetChoDef'{bool1=true,int1=17,set1=[]}),
+    roundtrip('SetChoDef',
+	      #'SetChoDef'{bool1=true,int1=17,set1=[{boolIn,true},{intIn,25}]}),
+    roundtrip('SetChoOpt',
+	      #'SetChoOpt'{bool1=true,int1=17,set1=asn1_NOVALUE}),
+    roundtrip('SetChoOpt',
+	      #'SetChoOpt'{bool1=true,int1=17,set1=[{boolIn,true},{intIn,25}]}),
 
+    roundtrip('SetChoEmbDef',
+	      #'SetChoEmbDef'{bool1=true,int1=17,set1=asn1_DEFAULT},
+	      #'SetChoEmbDef'{bool1=true,int1=17,set1=[]}),
+    roundtrip('SetChoEmbDef',
+	      #'SetChoEmbDef'{bool1=true,int1=17,
+			      set1=[{boolIn,true},{intIn,25}]}),
+    roundtrip('SetChoEmbOpt',
+	      #'SetChoEmbOpt'{bool1=true,int1=17,set1=asn1_NOVALUE}),
+    roundtrip('SetChoEmbOpt',
+	      #'SetChoEmbOpt'{bool1=true,int1=17,
+			      set1=[{boolIn,true},{intIn,25}]}),
+
+    roundtrip('SetOfChoEmbDef',
+	      [#'SetOfChoEmbDef_SETOF'{bool1=true,int1=17,set1=asn1_DEFAULT}],
+	      [#'SetOfChoEmbDef_SETOF'{bool1=true,int1=17,set1=[]}]),
+    roundtrip('SetOfChoEmbDef',
+	      [#'SetOfChoEmbDef_SETOF'{bool1=true,int1=17,
+				       set1=[{boolIn,true},{intIn,25}]}]),
+
+    roundtrip('SetOfChoEmbOpt',
+	      [#'SetOfChoEmbOpt_SETOF'{bool1=true,int1=17,set1=asn1_NOVALUE}]),
+    roundtrip('SetOfChoEmbOpt',
+	      [#'SetOfChoEmbOpt_SETOF'{bool1=true,int1=17,
+				       set1=[{boolIn,true},{intIn,25}]}]),
 
-main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetOfCho','SetChoDef',#'SetChoDef'{bool1 = true,
-							  int1 = 17}),
-    ?line {ok,{'SetChoDef',true,17,[]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoDef',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SetOfCho','SetChoDef',#'SetChoDef'{bool1 = true,
-							  int1 = 17,
-							  set1 = [{boolIn,true},
-								  {intIn,25}]}),
-    ?line {ok,{'SetChoDef',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoDef',lists:flatten(Bytes12)),
-    
-    
-    
-    ?line {ok,Bytes15} = 
-	asn1_wrapper:encode('SetOfCho','SetChoOpt',#'SetChoOpt'{bool1 = true,
-							  int1 = 17}),
-    ?line {ok,{'SetChoOpt',true,17,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoOpt',lists:flatten(Bytes15)),
-    
-    
-    ?line {ok,Bytes16} = 
-	asn1_wrapper:encode('SetOfCho','SetChoOpt',#'SetChoOpt'{bool1 = true,
-							  int1 = 17,
-							  set1 = [{boolIn,true},
-								  {intIn,25}]}),
-    ?line {ok,{'SetChoOpt',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoOpt',lists:flatten(Bytes16)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetOfCho','SetChoEmbDef',#'SetChoEmbDef'{bool1 = true,
-								int1 = 17}),
-    ?line {ok,{'SetChoEmbDef',true,17,[]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoEmbDef',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SetOfCho','SetChoEmbDef',#'SetChoEmbDef'{bool1 = true,
-								int1 = 17,
-								set1 = [{boolIn,true},
-									{intIn,25}]}),
-    ?line {ok,{'SetChoEmbDef',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoEmbDef',lists:flatten(Bytes22)),
-    
-    
-    
-    ?line {ok,Bytes25} = 
-	asn1_wrapper:encode('SetOfCho','SetChoEmbOpt',#'SetChoEmbOpt'{bool1 = true,
-								int1 = 17}),
-    ?line {ok,{'SetChoEmbOpt',true,17,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoEmbOpt',lists:flatten(Bytes25)),
-    
-    
-    ?line {ok,Bytes26} = 
-	asn1_wrapper:encode('SetOfCho','SetChoEmbOpt',#'SetChoEmbOpt'{bool1 = true,
-								int1 = 17,
-								set1 = [{boolIn,true},
-									{intIn,25}]}),
-    ?line {ok,{'SetChoEmbOpt',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoEmbOpt',lists:flatten(Bytes26)),
-    
-    
-    
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetOfCho','SetOfChoEmbDef',[#'SetOfChoEmbDef_SETOF'{bool1 = true,
-									   int1 = 17}]),
-    ?line {ok,[{'SetOfChoEmbDef_SETOF',true,17,[]}]} = 
-	asn1_wrapper:decode('SetOfCho','SetOfChoEmbDef',lists:flatten(Bytes31)),
-    
-    
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SetOfCho','SetOfChoEmbDef',
-		      [#'SetOfChoEmbDef_SETOF'{bool1 = true,
-					       int1 = 17,
-					       set1 = [{boolIn,true},
-						       {intIn,25}]}]),
-    ?line {ok,[{'SetOfChoEmbDef_SETOF',true,17,[{boolIn,true},{intIn,25}]}]} = 
-	asn1_wrapper:decode('SetOfCho','SetOfChoEmbDef',lists:flatten(Bytes32)),
-    
-    
-    
-    ?line {ok,Bytes35} = 
-	asn1_wrapper:encode('SetOfCho','SetOfChoEmbOpt',[#'SetOfChoEmbOpt_SETOF'{bool1 = true,
-									   int1 = 17}]),
-    ?line {ok,[{'SetOfChoEmbOpt_SETOF',true,17,asn1_NOVALUE}]} = 
-	asn1_wrapper:decode('SetOfCho','SetOfChoEmbOpt',lists:flatten(Bytes35)),
-    
-    
-    ?line {ok,Bytes36} = 
-	asn1_wrapper:encode('SetOfCho','SetOfChoEmbOpt',
-		      [#'SetOfChoEmbOpt_SETOF'{bool1 = true,
-					       int1 = 17,
-					       set1 = [{boolIn,true},
-						       {intIn,25}]}]),
-    ?line {ok,[{'SetOfChoEmbOpt_SETOF',true,17,[{boolIn,true},{intIn,25}]}]} = 
-	asn1_wrapper:decode('SetOfCho','SetOfChoEmbOpt',lists:flatten(Bytes36)),
-    
-    
-    
-    
     ok.
 
+roundtrip(T, V) ->
+    roundtrip(T, V, V).
 
+roundtrip(Type, Value, ExpectedValue) ->
+    asn1_test_lib:roundtrip('SetOfCho', Type, Value, ExpectedValue).