Merge branch 'maint'

* maint: (128 commits)
  beam_lib: Correct wrong type specification
  testSeqOf: Test constrained, extensible sizes
  [snmp/agent] Some restructuring of test suite
  Clean up testSeqOf
  Extend tests cases for BIT STRING
  Improve tests of ENUMERATED
  asn1ct_check: Eliminate useless Per argument from complist_as_tuple()
  asn1ct_check: Don't pass on #'ObjectClassFieldType'{} with fixed type
  asn1ct_gen_per: Remove useless renewal of 'enumval'
  Fix encoding of semi-constrained, extensible INTEGERs
  PER/UPER: Fix decoding of semi-constrained INTEGERs
  testPrim: Simplify test cases using a roundtrip function
  BER: Fix handling of a constructed default value for a class
  PER: Generate code for deep table constraints at compile-time
  Normalize data representation for table constraints
  asn1ct: Simplify check_value/2
  Extend tests to cover more code in asn1ct_check
  Clean up checking of values for ENUMERATEDs
  Introduce a new mechanism for structured error handling
  asn1_db: Make dbput/3 and dbsave/2 asynchronous
  ...

1 files changed, 23 insertions, 36 deletions

diff --git a/lib/asn1/test/testDeepTConstr.erl b/lib/asn1/test/testDeepTConstr.erl
index 3df7bcbaa0..e826cafa0c 100644
--- a/lib/asn1/test/testDeepTConstr.erl
+++ b/lib/asn1/test/testDeepTConstr.erl
@@ -40,53 +40,40 @@ main(_Erule) ->
 	      {any,"DK"},
 	      {final,"NO"}]}},
 
-    ?line {ok,Bytes1} = 
-	asn1_wrapper:encode('TConstrChoice','FilterItem',Val1),
-    
-    ?line {error,Reason} = asn1_wrapper:decode('TConstrChoice','FilterItem',Bytes1),
-    
+    {ok,Bytes1} = 'TConstrChoice':encode('FilterItem', Val1),
+    {error,Reason} = asn1_wrapper:decode('TConstrChoice','FilterItem',Bytes1),
     io:format("Reason: ~p~n~n",[Reason]),
-    
-    ?line {ok,Bytes2} = 
-	asn1_wrapper:encode('TConstrChoice','FilterItem',Val2),
-    
-    ?line {ok,Res} = asn1_wrapper:decode('TConstrChoice','FilterItem',Bytes2),
-    
-
+    {ok,Bytes2} = 'TConstrChoice':encode('FilterItem', Val2),
+    {ok,Res} = 'TConstrChoice':decode('FilterItem', Bytes2),
 
     %% test of OTP-4248.
-    ?line {ok,Bytes3} =
-	asn1_wrapper:encode('TConstrChoice','Seq',{'Seq',3,Bytes2}),
-
-    ?line {ok,{'Seq',3,Bytes4}} =
-	asn1_wrapper:decode('TConstrChoice','Seq',Bytes3),
-    
-    ?line {ok,Res} = asn1_wrapper:decode('TConstrChoice','FilterItem',Bytes4),
+    {ok,Bytes3} = 'TConstrChoice':encode('Seq', {'Seq',3,Bytes2}),
+    {ok,{'Seq',3,Bytes4}} = 'TConstrChoice':decode('Seq', Bytes3),
+    {ok,Res} = 'TConstrChoice':decode('FilterItem', Bytes4),
     
     %% test of TConstr
 
-    Seq1Val = {'Seq1',{'Seq1_a',12,{2,4}},{'Seq1_b',13,{'Type-object1',14,true}}},
-    ?line {ok,Bytes5} =
-	asn1_wrapper:encode('TConstr','Seq1',Seq1Val),
-    
-    ?line {ok,Seq1Val} =
-	asn1_wrapper:decode('TConstr','Seq1',Bytes5),
+    Seq1Val = {'Seq1',{'Seq1_a',12,{2,4}},
+	       {'Seq1_b',13,{'Type-object1',14,true}}},
+    roundtrip('TConstr', 'Seq1', Seq1Val),
     
 
     Seq2Val = {'Seq2',123,{'Seq2_content',{2,6,7},
 			   {first,{'Type-object3_first',false,47}},
 			   false}},
-    
-    ?line {ok,Bytes6} =
-	asn1_wrapper:encode('TConstr','Seq2',Seq2Val),
+    roundtrip('TConstr', 'Seq2', Seq2Val),
 
-    ?line {ok,Seq2Val} =
-	asn1_wrapper:decode('TConstr','Seq2',Bytes6),
+    roundtrip('TConstr', 'Info', {'Info',{'Info_xyz',{1,2}},1234}),
+
+    roundtrip('TConstr', 'Deeper',
+	      {'Deeper',
+	       {'Deeper_a',12,
+		{'Deeper_a_s',{2,4},42}},
+	       {'Deeper_b',13,{'Type-object1',14,true}}}),
+    ok.
 
-    InfoVal = {'Info',{'Info_xyz',{1,2}},1234},
-    
-    ?line {ok,Bytes7} =
-	asn1_wrapper:encode('TConstr','Info',InfoVal),
 
-    ?line {ok,InfoVal} =
-	asn1_wrapper:decode('TConstr','Info',Bytes7).
+roundtrip(M, T, V) ->
+    {ok,E} = M:encode(T, V),
+    {ok,V} = M:decode(T, E),
+    ok.