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, 52 insertions, 34 deletions

diff --git a/lib/asn1/test/h323test.erl b/lib/asn1/test/h323test.erl
index 426ae16994..3baaa994ea 100644
--- a/lib/asn1/test/h323test.erl
+++ b/lib/asn1/test/h323test.erl
@@ -26,44 +26,62 @@ run(per)     -> run();
 run(_Rules)  -> ok.
 
 run() ->
-    alerting(),
-    connect(),
+    roundtrip('H323-UserInformation', alerting_val(), alerting_enc()),
+    roundtrip('H323-UserInformation', connect_val(), connect_enc()),
+    general_string(),
     ok.
 
-dec_alerting() ->
-    Cs = "0380060008914a0002020120110000000000000000000000000000000000",
-    ByteList = hexstr2bytes(Cs),
-    asn1_wrapper:decode('H323-MESSAGES','H323-UserInformation',ByteList).
+alerting_val() ->
+    {'H323-UserInformation',
+     {'H323-UU-PDU',
+      {alerting,
+       {'Alerting-UUIE',
+	{0,0,8,2250,0,2},
+	{'EndpointType',asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
+	 asn1_NOVALUE,asn1_NOVALUE,
+	 {'TerminalInfo',asn1_NOVALUE},
+	 false,false},
+	asn1_NOVALUE,
+	{'CallIdentifier',[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]},
+	asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}},
+      asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE},
+     asn1_NOVALUE}.
 
-enc_alerting(V) ->
-    asn1_wrapper:encode('H323-MESSAGES','H323-UserInformation',V).
+alerting_enc() ->
+    "0380060008914a0002020120110000000000000000000000000000000000".
 
-alerting() ->
-    {ok,V} = dec_alerting(),
-    {ok,B} = enc_alerting(V),
-    ByteList = lists:flatten(B),
-    {ok,V} = asn1_wrapper:decode('H323-MESSAGES','H323-UserInformation',ByteList).
+connect_val() ->
+    {'H323-UserInformation',
+     {'H323-UU-PDU',
+      {connect,
+       {'Connect-UUIE',
+	{0,0,8,2250,0,2},
+	{ipAddress,
+	 {'TransportAddress_ipAddress',[136,225,41,58],1187}},
+	{'EndpointType',asn1_NOVALUE,
+	 {'VendorIdentifier',
+	  {'H221NonStandard',181,0,21324},
+	  [77,105,99,114,111,115,111,102,116,174,32,78,101,116,
+	   77,101,100,116,105,110,103,174,0],
+	  [51,46,48,0]},
+	 asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
+	 {'TerminalInfo',asn1_NOVALUE},
+	 false,false},
+	[22,137,237,197,191,35,211,17,140,45,0,192,79,75,28,208],
+	{'CallIdentifier',[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]},
+	asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}},
+      asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE},
+     asn1_NOVALUE}.
 
+connect_enc() ->
+    "02c0060008914a00020088e1293a04a322c0b500534c164d6963726f736f6674ae204e65744d656474696e67ae0003332e3000001689edc5bf23d3118c2d00c04f4b1cd00900110000000000000000000000000000000000".
 
-dec_connect() ->
-    Cs = "02c0060008914a00020088e1293a04a322c0b500534c164d6963726f736f6674ae204e65744d656474696e67ae0003332e3000001689edc5bf23d3118c2d00c04f4b1cd00900110000000000000000000000000000000000",
-    ByteList = hexstr2bytes(Cs),
-    asn1_wrapper:decode('H323-MESSAGES','H323-UserInformation',ByteList).
+general_string() ->
+    Type = 'MultimediaSystemControlMessage',
+    UI = <<109,64,1,57>>,
+    {ok, _V} = 'MULTIMEDIA-SYSTEM-CONTROL':decode(Type, UI).
 
-enc_connect(V) ->
-    asn1_wrapper:encode('H323-MESSAGES','H323-UserInformation',V).
-
-connect() ->
-    {ok,V} = dec_connect(),
-    {ok,B} = enc_connect(V),
-    ByteList = lists:flatten(B),
-    {ok,V} = asn1_wrapper:decode('H323-MESSAGES','H323-UserInformation',ByteList).
-
-hexstr2bytes([D1,D2|T]) ->
-    [dig2num(D1)*16+dig2num(D2)|hexstr2bytes(T)];
-hexstr2bytes([]) ->
-    [].
-
-dig2num(D) when D >= $0, D =< $9 -> D - $0;
-dig2num(D) when D >= $a, D =< $f -> 10 + D - $a;
-dig2num(D) when D >= $A, D =< $F -> 10 + D - $A.
+roundtrip(T, V, HexString) ->
+    Enc = asn1_test_lib:hex_to_bin(HexString),
+    Enc = asn1_test_lib:roundtrip_enc('H323-MESSAGES', T, V),
+    ok.