Merge branch 'anders/diameter/suites_and_dialyzer/OTP-9781'

* anders/diameter/suites_and_dialyzer/OTP-9781:
  Tell dialyzer not to warn about unused functions
  Add compiler testcases for generation and compilation to beam
  Fix semantic checks on AVP qualifiers
  Minor codegen/debug fix
  Deal with crypto:start() failure in TLS suite
  Don't assume empty sndrcvinfo in diameter_sctp

3 files changed, 185 insertions, 15 deletions

diff --git a/lib/diameter/test/diameter_app_SUITE.erl b/lib/diameter/test/diameter_app_SUITE.erl
index 808f2cd30d..53332af626 100644
--- a/lib/diameter/test/diameter_app_SUITE.erl
+++ b/lib/diameter/test/diameter_app_SUITE.erl
@@ -48,6 +48,7 @@
                            diameter_dict_parser,
                            diameter_dict_util,
                            diameter_exprecs,
+                           diameter_nowarn,
                            diameter_make]).
 
 -define(HELP_MODULES, [diameter_dbg,
diff --git a/lib/diameter/test/diameter_compiler_SUITE.erl b/lib/diameter/test/diameter_compiler_SUITE.erl
index cc4b1ddac5..66d788f6ec 100644
--- a/lib/diameter/test/diameter_compiler_SUITE.erl
+++ b/lib/diameter/test/diameter_compiler_SUITE.erl
@@ -22,7 +22,6 @@
 %%
 
 -module(diameter_compiler_SUITE).
--compile({no_auto_import, [error/2]}).
 
 -export([suite/0,
          all/0,
@@ -30,14 +29,16 @@
          end_per_suite/1]).
 
 %% testcases
--export([format/1,
-         replace/1, replace/2]).
+-export([format/1,  format/2,
+         replace/1, replace/2,
+         generate/1, generate/4, generate/0]).
 
 -export([dict/0]).  %% fake dictionary module
 
 -define(base, "base_rfc3588.dia").
 -define(util, diameter_util).
 -define(S, atom_to_list).
+-define(L, integer_to_list).
 
 %% ===========================================================================
 
@@ -46,7 +47,10 @@
 %% returned in the first element of the error tuple returned by
 %% diameter_dict_util:parse/2.
 -define(REPLACE,
-        [{scan,
+        [{ok,
+          "",
+          ""},
+         {scan,
           "@id 0",
           "@id \\&"},
          {scan,
@@ -154,9 +158,126 @@
          {invalid_avp_order,
           "CEA ::=",
           "{Result-Code} &"},
-         {invalid_qualifier,
-          "CEA ::=.*",
-          "& 3*2"},
+         {ok,
+          "{ Product-Name",
+          "* &"},
+         {required_avp_has_zero_max_arity,
+          "{ Product-Name",
+          "*0 &"},
+         {required_avp_has_zero_min_arity,
+          "{ Product-Name",
+          "0* &"},
+         {required_avp_has_zero_min_arity,
+          "{ Product-Name",
+          "0*0 &"},
+         {ok,
+          "{ Product-Name",
+          "*1 &"},
+         {ok,
+          "{ Product-Name",
+          "1* &"},
+         {ok,
+          "{ Product-Name",
+          "1*1 &"},
+         {ok,
+          "{ Product-Name",
+          "2* &"},
+         {ok,
+          "{ Product-Name",
+          "*2 &"},
+         {ok,
+          "{ Product-Name",
+          "2*2 &"},
+         {ok,
+          "{ Product-Name",
+          "2*3 &"},
+         {qualifier_has_min_greater_than_max,
+          "{ Product-Name",
+          "3*2 &"},
+         {ok,
+          "\\[ Origin-State-Id",
+          "* &"},
+         {ok,
+          "\\[ Origin-State-Id",
+          "0* &"},
+         {ok,
+          "\\[ Origin-State-Id",
+          "*0 &"},
+         {ok,
+          "\\[ Origin-State-Id",
+          "0*0 &"},
+         {ok,
+          "\\[ Origin-State-Id",
+          "0*1 &"},
+         {ok,
+          "\\[ Origin-State-Id",
+          "0*2 &"},
+         {ok,
+          "\\[ Origin-State-Id",
+          "*1 &"},
+         {optional_avp_has_nonzero_min_arity,
+          "\\[ Origin-State-Id",
+          "1* &"},
+         {optional_avp_has_nonzero_min_arity,
+          "\\[ Origin-State-Id",
+          "1*1 &"},
+         {ok,
+          "\\[ Origin-State-Id",
+          "*2 &"},
+         {optional_avp_has_nonzero_min_arity,
+          "\\[ Origin-State-Id",
+          "2* &"},
+         {optional_avp_has_nonzero_min_arity,
+          "\\[ Origin-State-Id",
+          "2*2 &"},
+         {optional_avp_has_nonzero_min_arity,
+          "\\[ Origin-State-Id",
+          "2*3 &"},
+         {optional_avp_has_nonzero_min_arity,
+          "\\[ Origin-State-Id",
+          "3*2 &"},
+         {ok,
+          "^ *< Session-Id",
+          "* &"},
+         {ok,
+          "^ *< Session-Id",
+          "*0 &"},
+         {ok,
+          "^ *< Session-Id",
+          "0* &"},
+         {ok,
+          "^ *< Session-Id",
+          "0*0 &"},
+         {ok,
+          "^ *< Session-Id",
+          "0*1 &"},
+         {ok,
+          "^ *< Session-Id",
+          "0*2 &"},
+         {ok,
+          "^ *< Session-Id",
+          "*1 &"},
+         {ok,
+          "^ *< Session-Id",
+          "1* &"},
+         {ok,
+          "^ *< Session-Id",
+          "1*1 &"},
+         {ok,
+          "^ *< Session-Id",
+          "*2 &"},
+         {ok,
+          "^ *< Session-Id",
+          "2* &"},
+         {ok,
+          "^ *< Session-Id",
+          "2*2 &"},
+         {ok,
+          "^ *< Session-Id",
+          "2*3 &"},
+         {qualifier_has_min_greater_than_max,
+          "^ *< Session-Id",
+          "3*2 &"},
          {avp_already_referenced,
           "CER ::=.*",
           "& {Origin-Host}"},
@@ -213,7 +334,8 @@ suite() ->
 
 all() ->
     [format,
-     replace].
+     replace,
+     generate].
 
 %% Error handling testcases will make an erroneous dictionary out of
 %% the base dictionary and check that the expected error results.
@@ -229,24 +351,35 @@ end_per_suite(_Config) ->
 %% ===========================================================================
 %% testcases
 
+%% format/1
+%%
 %% Ensure that parse o format is the identity map.
+
 format(Config) ->
     Bin = proplists:get_value(base, Config),
-    {ok, Dict} = diameter_dict_util:parse(Bin, []),
+    [] = ?util:run([{?MODULE, [format, M, Bin]}
+                    || E <- ?REPLACE,
+                       {ok, M} <- [norm(E)]]).
+
+format(Mods, Bin) ->
+    B = modify(Bin, Mods),
+    {ok, Dict} = diameter_dict_util:parse(B, []),
     {ok, D} = diameter_dict_util:parse(diameter_dict_util:format(Dict), []),
     {Dict, Dict} = {Dict, D}.
 
 %% replace/1
+%%
+%% Ensure the expected success/error when parsing a morphed common
+%% dictionary.
 
 replace(Config) ->
     Bin = proplists:get_value(base, Config),
-    [] = ?util:run([{?MODULE, [replace, E, Bin]} || E <- ?REPLACE]).
-
-replace({E, RE, Repl}, Bin) ->
-    replace({E, [{RE, Repl}]}, Bin);
+    [] = ?util:run([{?MODULE, [replace, N, Bin]}
+                    || E <- ?REPLACE,
+                       N <- [norm(E)]]).
 
 replace({E, Mods}, Bin) ->
-    B = iolist_to_binary(lists:foldl(fun re/2, Bin, Mods)),
+    B = modify(Bin, Mods),
     case {E, diameter_dict_util:parse(B, [{include, here()}]), Mods} of
         {ok, {ok, Dict}, _} ->
             Dict;
@@ -260,8 +393,44 @@ replace({E, Mods}, Bin) ->
 re({RE, Repl}, Bin) ->
     re:replace(Bin, RE, Repl, [multiline]).
 
+%% generate/1
+%%
+%% Ensure success when generating code and compiling.
+
+generate() ->
+    [{timetrap, {seconds, length(?REPLACE)}}].
+
+generate(Config) ->
+    Bin = proplists:get_value(base, Config),
+    Rs  = lists:zip(?REPLACE, lists:seq(1, length(?REPLACE))),
+    [] = ?util:run([{?MODULE, [generate, M, Bin, N, T]}
+                    || {E,N} <- Rs,
+                       {ok, M} <- [norm(E)],
+                       T <- [erl, hrl, spec]]).
+
+generate(Mods, Bin, N, Mode) ->
+    B = modify(Bin, Mods ++ [{"@name .*", "@name dict" ++ ?L(N)}]),
+    {ok, Dict} = diameter_dict_util:parse(B, []),
+    File = "dict" ++ integer_to_list(N),
+    {_, ok} = {Dict, diameter_codegen:from_dict("dict",
+                                                Dict,
+                                                [{name, File},
+                                                 {prefix, "base"},
+                                                 debug],
+                                                Mode)},
+    Mode == erl
+        andalso ({ok, _} = compile:file(File ++ ".erl", [return_errors])).
+
 %% ===========================================================================
 
+modify(Bin, Mods) ->
+    lists:foldl(fun re/2, Bin, Mods).
+
+norm({E, RE, Repl}) ->
+    {E, [{RE, Repl}]};
+norm({_,_} = T) ->
+    T.
+
 nochar(Char, Str, Err) ->
     Err == parse orelse not lists:member(Char, Str) orelse Str.
 
diff --git a/lib/diameter/test/diameter_tls_SUITE.erl b/lib/diameter/test/diameter_tls_SUITE.erl
index a325ca33eb..38282282b8 100644
--- a/lib/diameter/test/diameter_tls_SUITE.erl
+++ b/lib/diameter/test/diameter_tls_SUITE.erl
@@ -157,7 +157,7 @@ init_per_suite(Config) ->
     try
         false /= os:find_executable("openssl")
             orelse throw({?MODULE, no_openssl}),
-        ok == crypto:start()
+        ok == (catch crypto:start())
             orelse throw({?MODULE, no_crypto}),
         Config
     catch