Eliminate the use of asn1_wrapper

The asn1_wrapper made some sense when encode functions
could either produce a list or a binary, depending on the
backend. Now encode functions always produce a binary.

To improve readbility of the test suites, eliminate the asn1_wrapper
functions by replacing them with calls to one of the roundtrip
functions in asn1_test_lib. When it is not possible to use
the roundtrip functions, call the module in question directly.

While at it, also remove ?line macros that are near to the
touched code and use asn1_test_lib:hex_to_bin/1 instead of
home-brewn hex conversion routines.

1 files changed, 96 insertions, 186 deletions

diff --git a/lib/asn1/test/testSetOf.erl b/lib/asn1/test/testSetOf.erl
index 08723fb468..54c42c1f21 100644
--- a/lib/asn1/test/testSetOf.erl
+++ b/lib/asn1/test/testSetOf.erl
@@ -28,198 +28,108 @@
 -record('Set3',{bool3, set3 = asn1_DEFAULT, int3}).
 -record('Set4',{set41 = asn1_DEFAULT, set42 = asn1_DEFAULT, set43 = asn1_DEFAULT}).
 -record('SetIn',{boolIn, intIn}).
-%-record('SetCho',{bool1, int1, set1 = asn1_DEFAULT}).
-%-record('SetChoInline',{bool1, int1, set1 = asn1_DEFAULT}).
-%-record('SetChoOfInline_SETOF',{bool1, int1, set1 = asn1_DEFAULT}).
 -record('SetEmp',{set1}).
 -record('Empty',{}).
 
 
 
 main(_Rules) ->
+    roundtrip('Set1',
+	      #'Set1'{bool1=true,int1=17,set1=asn1_DEFAULT},
+	      #'Set1'{bool1=true,int1=17,set1=[]}),
+    roundtrip('Set1',
+	      #'Set1'{bool1=true,int1=17,
+		      set1=[#'SetIn'{boolIn=true,intIn=25}]}),
+    roundtrip('Set1', #'Set1'{bool1=true,int1=17,
+			      set1=[#'SetIn'{boolIn=true,intIn=25},
+				    #'SetIn'{boolIn=false,intIn=125},
+				    #'SetIn'{boolIn=false,intIn=225}]}),
+
+    roundtrip('Set2',
+	      #'Set2'{set2=asn1_DEFAULT,bool2=true,int2=17},
+	      #'Set2'{set2=[],bool2=true,int2=17}),
+    roundtrip('Set2',
+	      #'Set2'{set2=[#'SetIn'{boolIn=true,intIn=25}],
+		      bool2=true,int2=17}),
+    roundtrip('Set2',
+	      #'Set2'{set2=[#'SetIn'{boolIn=true,intIn=25},
+			    #'SetIn'{boolIn=false,intIn=125},
+			    #'SetIn'{boolIn=false,intIn=225}],
+		      bool2=true,int2=17}),
+
+    roundtrip('Set3',
+	      #'Set3'{bool3=true,set3=asn1_DEFAULT,int3=17},
+	      #'Set3'{bool3=true,set3=[],int3=17}),
+    roundtrip('Set3',
+	      #'Set3'{bool3=true,set3=[#'SetIn'{boolIn=true,intIn=25}],
+		      int3=17}),
+    roundtrip('Set3',
+	      #'Set3'{bool3=true,
+		      set3=[#'SetIn'{boolIn=true,intIn=25},
+			    #'SetIn'{boolIn=false,intIn=125},
+			    #'SetIn'{boolIn=false,intIn=225}],
+		      int3=17}),
+
+    roundtrip('Set4',
+	      #'Set4'{set41=asn1_DEFAULT,set42=asn1_DEFAULT,
+		      set43=asn1_DEFAULT},
+	      #'Set4'{set41=[],set42=[],set43=[]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=[#'SetIn'{boolIn=true,intIn=25}],
+		      set42=asn1_DEFAULT,set43=asn1_DEFAULT},
+	      #'Set4'{set41=[#'SetIn'{boolIn=true,intIn=25}],
+		      set42=[],set43=[]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}],
+		      set42=asn1_DEFAULT,set43=asn1_DEFAULT},
+	      #'Set4'{set41=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}],
+		      set42=[],set43=[]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=asn1_DEFAULT,
+		      set42=[#'SetIn'{boolIn=true,intIn=25}],
+		      set43=asn1_DEFAULT},
+	      #'Set4'{set41=[],
+		      set42=[#'SetIn'{boolIn=true,intIn=25}],
+		      set43=[]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=asn1_DEFAULT,
+		      set42=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}],
+		      set43=asn1_DEFAULT},
+	      #'Set4'{set41=[],
+		      set42=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}],
+		      set43=[]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=asn1_DEFAULT,set42=asn1_DEFAULT,
+		      set43=[#'SetIn'{boolIn=true,intIn=25}]},
+	      #'Set4'{set41=[],set42=[],
+		      set43=[#'SetIn'{boolIn=true,intIn=25}]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=asn1_DEFAULT,set42=asn1_DEFAULT,
+		      set43=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}]},
+	      #'Set4'{set41=[],set42=[],
+		      set43=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}]}),
+
+    roundtrip('SetOs', ["First","Second","Third"]),
+    roundtrip('SetOsImp', ["First","Second","Third"]),
+    roundtrip('SetOsExp', ["First","Second","Third"]),
+    roundtrip('SetEmp', #'SetEmp'{set1=[#'Empty'{}]}),
 
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetOf','Set1',#'Set1'{bool1 = true,
-					     int1 = 17}),
-    ?line {ok,{'Set1',true,17,[]}} = 
-	asn1_wrapper:decode('SetOf','Set1',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SetOf','Set1',#'Set1'{bool1 = true,
-					     int1 = 17,
-					     set1 = [#'SetIn'{boolIn = true,
-							      intIn = 25}]}),
-    ?line {ok,{'Set1',true,17,[{'SetIn',true,25}]}} = 
-	asn1_wrapper:decode('SetOf','Set1',lists:flatten(Bytes12)),
-    
-    
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SetOf','Set1',#'Set1'{bool1 = true,
-					     int1 = 17,
-					     set1 = [#'SetIn'{boolIn = true,
-							      intIn = 25},
-						     #'SetIn'{boolIn = false,
-							      intIn = 125},
-						     #'SetIn'{boolIn = false,
-							      intIn = 225}]}),
-    ?line {ok,{'Set1',true,17,[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}]}} = 
-	asn1_wrapper:decode('SetOf','Set1',lists:flatten(Bytes13)),
-
-
-
-
-
-
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetOf','Set2',#'Set2'{bool2 = true,
-					     int2 = 17}),
-    
-    ?line {ok,{'Set2',[],true,17}} = 
-	asn1_wrapper:decode('SetOf','Set2',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SetOf','Set2',#'Set2'{bool2 = true,
-					     int2 = 17,
-					     set2 = [#'SetIn'{boolIn = true,
-							      intIn = 25}]}),
-    ?line {ok,{'Set2',[{'SetIn',true,25}],true,17}} = 
-	asn1_wrapper:decode('SetOf','Set2',lists:flatten(Bytes22)),
-    
-    
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SetOf','Set2',#'Set2'{bool2 = true,
-					     int2 = 17,
-					     set2 = [#'SetIn'{boolIn = true,
-							      intIn = 25},
-						     #'SetIn'{boolIn = false,
-							      intIn = 125},
-						     #'SetIn'{boolIn = false,
-							      intIn = 225}]}),
-    ?line {ok,{'Set2',[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}],true,17}} = 
-	asn1_wrapper:decode('SetOf','Set2',lists:flatten(Bytes23)),
-    
-    
-
-
-
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetOf','Set3',#'Set3'{bool3 = true,
-					     int3 = 17}),
-    ?line {ok,{'Set3',true,[],17}} = 
-	asn1_wrapper:decode('SetOf','Set3',lists:flatten(Bytes31)),
-    
-    
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SetOf','Set3',#'Set3'{bool3 = true,
-					     int3 = 17,
-					     set3 = [#'SetIn'{boolIn = true,
-							      intIn = 25}]}),
-    ?line {ok,{'Set3',true,[{'SetIn',true,25}],17}} = 
-	asn1_wrapper:decode('SetOf','Set3',lists:flatten(Bytes32)),
-    
-    
-    ?line {ok,Bytes33} = 
-	asn1_wrapper:encode('SetOf','Set3',#'Set3'{bool3 = true,
-					     int3 = 17,
-					     set3 = [#'SetIn'{boolIn = true,
-							      intIn = 25},
-						     #'SetIn'{boolIn = false,
-							      intIn = 125},
-						     #'SetIn'{boolIn = false,
-							      intIn = 225}]}),
-    ?line {ok,{'Set3',true,[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}],17}} = 
-	asn1_wrapper:decode('SetOf','Set3',lists:flatten(Bytes33)),
-    
-  
-
-
-
-  
-    
-    ?line {ok,Bytes41} = asn1_wrapper:encode('SetOf','Set4',#'Set4'{}),
-    ?line {ok,{'Set4',[],[],[]}} = asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes41)),
-        
-    
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set41 = [#'SetIn'{boolIn = true,
-							       intIn = 25}]}),
-    ?line {ok,{'Set4',[{'SetIn',true,25}],[],[]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes42)),
-    
-    
-    ?line {ok,Bytes43} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set41 = [#'SetIn'{boolIn = true,
-							       intIn = 25},
-						      #'SetIn'{boolIn = false,
-							       intIn = 125},
-						      #'SetIn'{boolIn = false,
-							       intIn = 225}]}),
-    ?line {ok,{'Set4',[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}],[],[]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes43)),
-    
-    
-    ?line {ok,Bytes44} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set42 = [#'SetIn'{boolIn = true,
-								       intIn = 25}]}),
-    ?line {ok,{'Set4',[],[{'SetIn',true,25}],[]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes44)),
-    
-    
-    ?line {ok,Bytes45} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set42 = [#'SetIn'{boolIn = true,
-							       intIn = 25},
-						      #'SetIn'{boolIn = false,
-							       intIn = 125},
-						      #'SetIn'{boolIn = false,
-							       intIn = 225}]}),
-    ?line {ok,{'Set4',[],[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}],[]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes45)),
-    
-    
-    ?line {ok,Bytes46} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set43 = [#'SetIn'{boolIn = true,
-							       intIn = 25}]}),
-    ?line {ok,{'Set4',[],[],[{'SetIn',true,25}]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes46)),
-    
-    
-    ?line {ok,Bytes47} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set43 = [#'SetIn'{boolIn = true,
-							       intIn = 25},
-						      #'SetIn'{boolIn = false,
-							       intIn = 125},
-						      #'SetIn'{boolIn = false,
-							       intIn = 225}]}),
-    ?line {ok,{'Set4',[],[],[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes47)),
-    
-
-
-
-    ?line {ok,Bytes51} = asn1_wrapper:encode('SetOf','SetOs',["First","Second","Third"]),
-    ?line {ok,["First","Second","Third"]} = 
-	asn1_wrapper:decode('SetOf','SetOs',lists:flatten(Bytes51)),
-     
-    ?line {ok,Bytes52} = asn1_wrapper:encode('SetOf','SetOsImp',["First","Second","Third"]),
-    ?line {ok,["First","Second","Third"]} = 
-	asn1_wrapper:decode('SetOf','SetOsImp',lists:flatten(Bytes52)),
-     
-    ?line {ok,Bytes53} = asn1_wrapper:encode('SetOf','SetOsExp',["First","Second","Third"]),
-    ?line {ok,["First","Second","Third"]} = 
-	asn1_wrapper:decode('SetOf','SetOsExp',lists:flatten(Bytes53)),
-     
-
-
-
-
-
-    
-    ?line {ok,Bytes71} = asn1_wrapper:encode('SetOf','SetEmp',#'SetEmp'{set1 = [#'Empty'{}]}),
-    ?line {ok,{'SetEmp',[{'Empty'}]}} = asn1_wrapper:decode('SetOf','SetEmp',lists:flatten(Bytes71)),
-     
     ok.
 
+roundtrip(T, V) ->
+    roundtrip(T, V, V).
+
+roundtrip(Type, Value, ExpectedValue) ->
+    asn1_test_lib:roundtrip('SetOf', Type, Value, ExpectedValue).