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

diff --git a/lib/asn1/test/testTCAP.erl b/lib/asn1/test/testTCAP.erl
index aba13c94de..17511dc2b7 100644
--- a/lib/asn1/test/testTCAP.erl
+++ b/lib/asn1/test/testTCAP.erl
@@ -40,25 +40,26 @@ compile_asn1config(Config, Options) ->
 test(Erule,_Config) ->
 %    ?line OutDir = ?config(priv_dir,Config),
     %% testing OTP-4798, open type encoded with indefinite length
-    ?line {ok,_Res} = asn1_wrapper:decode('TCAPMessages-simple','MessageType', val_OTP_4798(Erule)),
+    {ok,_Res} = 'TCAPMessages-simple':decode('MessageType',
+					     val_OTP_4798(Erule)),
+
     %% testing OTP-4799, absent optional open type
-    ?line {ok,_Res2} = asn1_wrapper:decode('TCAPMessages-simple','MessageType',val_OTP_4799(Erule)),
+    {ok,_Res2} = 'TCAPMessages-simple':decode('MessageType',
+					      val_OTP_4799(Erule)),
+
     %% testing vance shipley's problems. Parameterized object sets.
     ?line Val3 = 'TCAPPackage_msg':val('PackageType',unidirectional),
-    ?line {ok,Bytes3} = asn1_wrapper:encode('TCAPPackage','PackageType',Val3),
-    ?line {ok,Res3} = asn1_wrapper:decode('TCAPPackage','PackageType',Bytes3),
+    Res3 = enc_dec('PackageType', Val3),
     ?line ok = 'TCAPPackage_msg':check_result('PackageType',unidirectional,Res3),
 %%    ?line io:format("Res3:~n~p~n~n",[Res3]),
     
     ?line Val4 = 'TCAPPackage_msg':val('PackageType',abort),
-    ?line {ok,Bytes4} = asn1_wrapper:encode('TCAPPackage','PackageType',Val4),
-    ?line {ok,Res4} = asn1_wrapper:decode('TCAPPackage','PackageType',Bytes4),
+    Res4 = enc_dec('PackageType', Val4),
     ?line ok = 'TCAPPackage_msg':check_result('PackageType',abort,Res4),
 %%    ?line io:format("Res4:~n~p~n~n",[Res4]),
 
     ?line Val5 = 'TCAPPackage_msg':val('PackageType',response),
-    ?line {ok,Bytes5} = asn1_wrapper:encode('TCAPPackage','PackageType',Val5),
-    ?line {ok,Res5} = asn1_wrapper:decode('TCAPPackage','PackageType',Bytes5),
+    Res5 = enc_dec('PackageType', Val5),
     ?line ok = 'TCAPPackage_msg':check_result('PackageType',response,Res5).
 %%    ?line io:format("Res5:~n~p~n~n",[Res5]).
 
@@ -73,21 +74,26 @@ val_OTP_4799(_) ->
     <<100,16,73,4,41,182,36,0,108,8,163,6,2,1,29,2,1,27>>.
 
 test_asn1config() ->
-    ?line Val = 'TCAPPackage_msg':val('PackageType',queryWithPerm),
-    ?line {ok,B} = asn1_wrapper:encode('TCAPPackage','PackageType',Val),
-    ?line {ok,ExMsg}='TCAPPackage':decode_PackageType(list_to_binary(B)),
-    ?line {_,{_,_,_,{Key,ExVal}}}=ExMsg,
-    ?line {ok,_Parts}='TCAPPackage':decode_part(Key,ExVal),
+    Val = 'TCAPPackage_msg':val('PackageType', queryWithPerm),
+    {ok,B} = 'TCAPPackage':encode('PackageType', Val),
+    {ok,ExMsg}='TCAPPackage':decode_PackageType(B),
+    {_,{_,_,_,{Key,ExVal}}} = ExMsg,
+    {ok,_Parts} = 'TCAPPackage':decode_part(Key, ExVal),
     
-    ?line Val2 = 'TCAPPackage_msg':val('TransactionPDU'),
-    ?line {ok,B2} = 'TCAPPackage':encode('TransactionPDU',Val2),
-    {ok,ExMsg2}='TCAPPackage':decode_TransactionPDU(B2),
-    ?line {_,_,_,{Key2,ExVal2}}=ExMsg2,
-    ?line {ok,_Parts2}='TCAPPackage':decode_part(Key2,ExVal2),
+    Val2 = 'TCAPPackage_msg':val('TransactionPDU'),
+    {ok,B2} = 'TCAPPackage':encode('TransactionPDU', Val2),
+    {ok,ExMsg2} = 'TCAPPackage':decode_TransactionPDU(B2),
+    {_,_,_,{Key2,ExVal2}} = ExMsg2,
+    {ok,_Parts2} = 'TCAPPackage':decode_part(Key2, ExVal2),
 
-    ?line Val3 = 'TCAPPackage_msg':val('PackageType',response),
-    ?line {ok,B3} = asn1_wrapper:encode('TCAPPackage','PackageType',Val3),
-    ?line {ok,ExMsg3}='TCAPPackage':decode_PackageType(list_to_binary(B3)),
-    ?line {_,{_,_,_,{Key3,ExVal3}}}=ExMsg3,
-    ?line {ok,_Parts3}='TCAPPackage':decode_part(Key3,ExVal3).
+    Val3 = 'TCAPPackage_msg':val('PackageType', response),
+    {ok,B3} = 'TCAPPackage':encode('PackageType', Val3),
+    {ok,ExMsg3} = 'TCAPPackage':decode_PackageType(B3),
+    {_,{_,_,_,{Key3,ExVal3}}} = ExMsg3,
+    {ok,_Parts3}='TCAPPackage':decode_part(Key3, ExVal3).
     
+enc_dec(T, V0) ->
+    M = 'TCAPPackage',
+    {ok,Enc} = M:encode(T, V0),
+    {ok,V} = M:decode(T, Enc),
+    V.