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, 23 insertions, 76 deletions

diff --git a/lib/asn1/test/testChoOptional.erl b/lib/asn1/test/testChoOptional.erl
index cbb8134e51..f5e77cb721 100644
--- a/lib/asn1/test/testChoOptional.erl
+++ b/lib/asn1/test/testChoOptional.erl
@@ -18,83 +18,30 @@
 %%
 %%
 -module(testChoOptional).
+-export([run/0]).
 
--export([optional/1]).
+-record('Seq1', {bool, int = asn1_NOVALUE, cho = asn1_NOVALUE}).
+-record('Seq2', {int = asn1_NOVALUE, cho = asn1_NOVALUE, bool}).
+-record('Seq3', {cho = asn1_NOVALUE, int = asn1_NOVALUE, bool}).
 
-%-include("ChoOptional.hrl").
--include_lib("test_server/include/test_server.hrl").
--include("External.hrl").
+run() ->
+    roundtrip('Seq1', #'Seq1'{bool=true,int=asn1_NOVALUE,cho=asn1_NOVALUE}),
+    roundtrip('Seq1', #'Seq1'{bool=true,int=233,cho=asn1_NOVALUE}),
+    roundtrip('Seq1', #'Seq1'{bool=true,int=asn1_NOVALUE,cho={vsCho,"Vs Str"}}),
+    roundtrip('Seq1', #'Seq1'{bool=true,int=asn1_NOVALUE,cho={ocStrCho,"Oct Str"}}),
+    roundtrip('Seq2', #'Seq2'{int=asn1_NOVALUE,cho=asn1_NOVALUE,bool=true}),
+    roundtrip('Seq2', #'Seq2'{int=233,cho=asn1_NOVALUE,bool=true}),
+    roundtrip('Seq2', #'Seq2'{int=asn1_NOVALUE,cho={vsCho,"Vs Str"},bool=true}),
+    roundtrip('Seq2', #'Seq2'{int=asn1_NOVALUE,cho={ocStrCho,"Oct Str"},bool=true}),
+    roundtrip('Seq3', #'Seq3'{cho=asn1_NOVALUE,int=asn1_NOVALUE,bool=true}),
+    roundtrip('Seq3', #'Seq3'{cho=asn1_NOVALUE,int=233,bool=true}),
+    roundtrip('Seq3', #'Seq3'{cho={vsCho,"Vs Str"},int=asn1_NOVALUE,bool=true}),
+    roundtrip('Seq3', #'Seq3'{cho={ocStrCho,"Oct Str"},int=asn1_NOVALUE,bool=true}),
+    ok.
 
--record('Seq1',{bool, int = asn1_NOVALUE, cho = asn1_NOVALUE}).
--record('Seq2',{int = asn1_NOVALUE, cho = asn1_NOVALUE, bool}).
--record('Seq3',{cho = asn1_NOVALUE, int = asn1_NOVALUE, bool}).
+roundtrip(Type, Value) ->
+    roundtrip('ChoOptional', Type, Value),
+    roundtrip('ChoOptionalImplicitTag', Type, Value).
 
-optional(_Rules) ->
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('ChoOptional','Seq1',#'Seq1'{bool = true}),
-    ?line {ok,{'Seq1',true,asn1_NOVALUE,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('ChoOptional','Seq1',lists:flatten(Bytes11)),
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('ChoOptional','Seq1',#'Seq1'{bool = true,
-								    int = 233}),
-    ?line {ok,{'Seq1',true,233,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('ChoOptional','Seq1',lists:flatten(Bytes12)),
-    
-    ?line {ok,Bytes13} = asn1_wrapper:encode('ChoOptional','Seq1',#'Seq1'{bool = true,
-								    cho = {vsCho,"Vs Str"}}),
-    ?line {ok,{'Seq1',true,asn1_NOVALUE,{vsCho,"Vs Str"}}} = 
-	asn1_wrapper:decode('ChoOptional','Seq1',lists:flatten(Bytes13)),
-    
-    ?line {ok,Bytes14} = 
-	asn1_wrapper:encode('ChoOptional','Seq1',#'Seq1'{bool = true,
-						   cho = {ocStrCho,"Oct Str"}}),
-    ?line {ok,{'Seq1',true,asn1_NOVALUE,{ocStrCho,"Oct Str"}}} = 
-	asn1_wrapper:decode('ChoOptional','Seq1',lists:flatten(Bytes14)),
-    
-    
-    
-    ?line {ok,Bytes21} = asn1_wrapper:encode('ChoOptional','Seq2',#'Seq2'{bool = true}),
-    ?line {ok,{'Seq2',asn1_NOVALUE,asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq2',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('ChoOptional','Seq2',#'Seq2'{bool = true,
-								    int = 233}),
-    ?line {ok,{'Seq2',233,asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq2',lists:flatten(Bytes22)),
-    
-    ?line {ok,Bytes23} = asn1_wrapper:encode('ChoOptional','Seq2',#'Seq2'{bool = true,
-								    cho = {vsCho,"Vs Str"}}),
-    ?line {ok,{'Seq2',asn1_NOVALUE,{vsCho,"Vs Str"},true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq2',lists:flatten(Bytes23)),
-    
-    ?line {ok,Bytes24} = 
-	asn1_wrapper:encode('ChoOptional','Seq2',#'Seq2'{bool = true,
-						   cho = {ocStrCho,"Oct Str"}}),
-    ?line {ok,{'Seq2',asn1_NOVALUE,{ocStrCho,"Oct Str"},true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq2',lists:flatten(Bytes24)),
-    
-    
-    
-    ?line {ok,Bytes31} = asn1_wrapper:encode('ChoOptional','Seq3',#'Seq3'{bool = true}),
-    ?line {ok,{'Seq3',asn1_NOVALUE,asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq3',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('ChoOptional','Seq3',#'Seq3'{bool = true,
-								    int = 233}),
-    ?line {ok,{'Seq3',asn1_NOVALUE,233,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq3',lists:flatten(Bytes32)),
-    
-    ?line {ok,Bytes33} = asn1_wrapper:encode('ChoOptional','Seq3',#'Seq3'{bool = true,
-								    cho = {vsCho,"Vs Str"}}),
-    ?line {ok,{'Seq3',{vsCho,"Vs Str"},asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq3',lists:flatten(Bytes33)),
-    
-    ?line {ok,Bytes34} = 
-	asn1_wrapper:encode('ChoOptional','Seq3',#'Seq3'{bool = true,
-						   cho = {ocStrCho,"Oct Str"}}),
-    ?line {ok,{'Seq3',{ocStrCho,"Oct Str"},asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq3',lists:flatten(Bytes34)),
-    
-    
-    
-    ok.
+roundtrip(Mod, Type, Value) ->
+    asn1_test_lib:roundtrip(Mod, Type, Value).