Exercise service_info in test suites

2 files changed, 33 insertions, 3 deletions

diff --git a/lib/diameter/test/diameter_relay_SUITE.erl b/lib/diameter/test/diameter_relay_SUITE.erl
index 134239d9b6..f10d82bdf8 100644
--- a/lib/diameter/test/diameter_relay_SUITE.erl
+++ b/lib/diameter/test/diameter_relay_SUITE.erl
@@ -48,6 +48,7 @@
          send_loop/1,
          send_timeout_1/1,
          send_timeout_2/1,
+         info/1,
          disconnect/1,
          stop_services/1,
          stop/1]).
@@ -136,7 +137,8 @@ tc() ->
      send4,
      send_loop,
      send_timeout_1,
-     send_timeout_2].
+     send_timeout_2,
+     info].
 
 %% ===========================================================================
 %% start/stop testcases
@@ -224,6 +226,9 @@ send_timeout(Tmo) ->
                   {'Re-Auth-Request-Type', ?AUTHORIZE_ONLY}],
     call(Req, [{filter, realm}, {timeout, Tmo}]).
 
+info(_Config) ->
+    [] = ?util:info().
+
 %% ===========================================================================
 
 realm(Host) ->
diff --git a/lib/diameter/test/diameter_util.erl b/lib/diameter/test/diameter_util.erl
index 38073e9916..890d24f6f8 100644
--- a/lib/diameter/test/diameter_util.erl
+++ b/lib/diameter/test/diameter_util.erl
@@ -35,7 +35,8 @@
          lport/3,
          listen/2, listen/3,
          connect/3, connect/4,
-         disconnect/4]).
+         disconnect/4,
+         info/0]).
 
 %% common_test-specific
 -export([write_priv/3,
@@ -262,7 +263,10 @@ listen(SvcName, Prot) ->
     listen(SvcName, Prot, []).
 
 listen(SvcName, Prot, Opts) ->
-    add_transport(SvcName, {listen, opts(Prot, listen) ++ Opts}).
+    SvcName = diameter:service_info(SvcName, name),  %% assert
+    Ref = add_transport(SvcName, {listen, opts(Prot, listen) ++ Opts}),
+    true = transport(SvcName, Ref),                  %% assert
+    Ref.
 
 %% ---------------------------------------------------------------------------
 %% connect/2-3
@@ -275,8 +279,11 @@ connect(Client, Prot, LRef) ->
 
 connect(Client, Prot, LRef, Opts) ->
     [PortNr] = lport(Prot, LRef, 20),
+    Client = diameter:service_info(Client, name),  %% assert
     true = diameter:subscribe(Client),
     Ref = add_transport(Client, {connect, opts(Prot, PortNr) ++ Opts}),
+    true = transport(Client, Ref),                 %% assert
+
     ok = receive
              {diameter_event, Client, {up, Ref, _, _, _}} -> ok
          after 10000 ->
@@ -284,6 +291,10 @@ connect(Client, Prot, LRef, Opts) ->
          end,
     Ref.
 
+transport(SvcName, Ref) ->
+    [Ref] == [R || [{ref, R} | _] <- diameter:service_info(SvcName, transport),
+                   R == Ref].
+
 %% ---------------------------------------------------------------------------
 %% disconnect/4
 %%
@@ -320,3 +331,17 @@ opts(listen) ->
     [];
 opts(PortNr) ->
     [{raddr, ?ADDR}, {rport, PortNr}].
+
+%% ---------------------------------------------------------------------------
+%% info/0
+
+info() ->
+    [_|_] = Svcs = diameter:services(),  %% assert
+    run([[fun info/1, S] || S <- Svcs]).
+
+info(S) ->
+    [_|_] = Keys = diameter:service_info(S, keys),
+    [] = run([[fun info/2, K, S] || K <- Keys]).
+
+info(Key, SvcName) ->
+    [{Key, _}] = diameter:service_info(SvcName, [Key]).