Minor suite simplification

5 files changed, 41 insertions, 40 deletions

diff --git a/lib/diameter/test/diameter_failover_SUITE.erl b/lib/diameter/test/diameter_failover_SUITE.erl
index bb820a8bf2..0ea8ae2d4e 100644
--- a/lib/diameter/test/diameter_failover_SUITE.erl
+++ b/lib/diameter/test/diameter_failover_SUITE.erl
@@ -103,9 +103,9 @@
 -define(SUCCESS, 2001).
 
 %% Value of Termination-Cause determines client/server behaviour.
--define(LOGOUT,   ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
--define(MOVED,    ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_USER_MOVED').
--define(TIMEOUT,  ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_SESSION_TIMEOUT').
+-define(LOGOUT,   ?'DIAMETER_BASE_TERMINATION-CAUSE_LOGOUT').
+-define(MOVED,    ?'DIAMETER_BASE_TERMINATION-CAUSE_USER_MOVED').
+-define(TIMEOUT,  ?'DIAMETER_BASE_TERMINATION-CAUSE_SESSION_TIMEOUT').
 
 %% ===========================================================================
 
diff --git a/lib/diameter/test/diameter_length_SUITE.erl b/lib/diameter/test/diameter_length_SUITE.erl
index 4e413e6a42..ffb19d2288 100644
--- a/lib/diameter/test/diameter_length_SUITE.erl
+++ b/lib/diameter/test/diameter_length_SUITE.erl
@@ -41,10 +41,10 @@
 %% diameter callbacks
 -export([peer_up/3,
          peer_down/3,
-         pick_peer/6,
-         prepare_request/5,
-         handle_answer/6,
-         handle_error/6,
+         pick_peer/5,
+         prepare_request/4,
+         handle_answer/5,
+         handle_error/5,
          handle_request/3]).
 
 -include("diameter.hrl").
@@ -73,14 +73,14 @@
                         {answer_errors, callback}]}]).
 
 -define(SUCCESS,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_SUCCESS').
+        ?'DIAMETER_BASE_RESULT-CODE_SUCCESS').
 -define(MISSING_AVP,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_MISSING_AVP').
+        ?'DIAMETER_BASE_RESULT-CODE_MISSING_AVP').
 -define(INVALID_MESSAGE_LENGTH,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_INVALID_MESSAGE_LENGTH').
+        ?'DIAMETER_BASE_RESULT-CODE_INVALID_MESSAGE_LENGTH').
 
 -define(LOGOUT,
-        ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
+        ?'DIAMETER_BASE_TERMINATION-CAUSE_LOGOUT').
 
 -define(GROUPS, [exit, handle, discard]).
 
@@ -196,21 +196,18 @@ send(discard) ->
         = call(0);
 
 send(Config) ->
-    Group = proplists:get_value(group, Config),
-    put({?MODULE, group}, Group),
-    send(Group).
+    send(proplists:get_value(group, Config)).
 
 %% ===========================================================================
 
 call(Delta) ->
-    Group = get({?MODULE, group}),
     diameter:call(?CLIENT,
                   ?DICT,
                   #diameter_base_STR
                   {'Termination-Cause' = ?LOGOUT,
                    'Auth-Application-Id' = ?DIAMETER_APP_ID_COMMON,
                    'Origin-State-Id' = [7]},
-                  [{extra, [Group, Delta]}]).
+                  [{extra, [Delta]}]).
 
 %% ===========================================================================
 %% diameter callbacks
@@ -225,14 +222,14 @@ peer_up(_SvcName, _Peer, State) ->
 peer_down(_SvcName, _Peer, State) ->
     State.
 
-%% pick_peer/6
+%% pick_peer/5
 
-pick_peer([Peer], _, ?CLIENT, _State, _Group, _Delta) ->
+pick_peer([Peer], _, ?CLIENT, _State, _Delta) ->
     {ok, Peer}.
 
-%% prepare_request/5
+%% prepare_request/4
 
-prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, _Group, Delta) ->
+prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, Delta) ->
     {send, resize(Delta, prepare(Pkt, Caps))}.
 
 prepare(#diameter_packet{msg = Req0} = Pkt, Caps) ->
@@ -253,14 +250,14 @@ resize(Delta, #diameter_packet{bin = Bin} = Pkt) ->
 resize(Delta, <<V, Len:24, T/binary>>) ->
     <<V, (Len + Delta):24, T/binary>>.
 
-%% handle_answer/6
+%% handle_answer/5
 
-handle_answer(Pkt, _Req, ?CLIENT, _Peer, _Group, _Delta) ->
+handle_answer(Pkt, _Req, ?CLIENT, _Peer, _Delta) ->
     Pkt#diameter_packet.msg.
 
-%% handle_error/6
+%% handle_error/5
 
-handle_error(Reason, _Req, ?CLIENT, _Peer, _Group, _Delta) ->
+handle_error(Reason, _Req, ?CLIENT, _Peer, _Delta) ->
     {error, Reason}.
 
 %% handle_request/3
@@ -280,8 +277,12 @@ handle_request(Pkt, ?SERVER, {_Ref, Caps}) ->
 answer(Group, #diameter_packet{errors = Es}, Ans) ->
     answer(Group, Es, Ans);
 
+%% No errors: just answer.
 answer(_, [], Ans) ->
     {reply, Ans};
+
+%% Otherwise an invalid length should only reach the callback if
+%% length_errors = handle.
 answer(Group, [RC|_], Ans)
   when RC == ?INVALID_MESSAGE_LENGTH, Group == handle;
        RC /= ?INVALID_MESSAGE_LENGTH ->
diff --git a/lib/diameter/test/diameter_relay_SUITE.erl b/lib/diameter/test/diameter_relay_SUITE.erl
index f10d82bdf8..614eb4d4ca 100644
--- a/lib/diameter/test/diameter_relay_SUITE.erl
+++ b/lib/diameter/test/diameter_relay_SUITE.erl
@@ -107,7 +107,7 @@
 -define(LOOP_DETECTED, 3005).
 -define(UNABLE_TO_DELIVER, 3002).
 
--define(LOGOUT, ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
+-define(LOGOUT, ?'DIAMETER_BASE_TERMINATION-CAUSE_LOGOUT').
 -define(AUTHORIZE_ONLY, ?'DIAMETER_BASE_RE-AUTH-REQUEST-TYPE_AUTHORIZE_ONLY').
 
 %% ===========================================================================
diff --git a/lib/diameter/test/diameter_tls_SUITE.erl b/lib/diameter/test/diameter_tls_SUITE.erl
index 6cc34b20c5..92a1113758 100644
--- a/lib/diameter/test/diameter_tls_SUITE.erl
+++ b/lib/diameter/test/diameter_tls_SUITE.erl
@@ -122,7 +122,7 @@
                   {capabilities, Caps}]}).
 
 -define(SUCCESS, 2001).
--define(LOGOUT, ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
+-define(LOGOUT, ?'DIAMETER_BASE_TERMINATION-CAUSE_LOGOUT').
 
 %% ===========================================================================
 
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index 6727e88b66..d3d6fff705 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -178,27 +178,27 @@
                      diameter_gen_acct_rfc6733]]]).
 
 -define(SUCCESS,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_SUCCESS').
+        ?'DIAMETER_BASE_RESULT-CODE_SUCCESS').
 -define(COMMAND_UNSUPPORTED,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_COMMAND_UNSUPPORTED').
+        ?'DIAMETER_BASE_RESULT-CODE_COMMAND_UNSUPPORTED').
 -define(TOO_BUSY,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_TOO_BUSY').
+        ?'DIAMETER_BASE_RESULT-CODE_TOO_BUSY').
 -define(APPLICATION_UNSUPPORTED,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_APPLICATION_UNSUPPORTED').
+        ?'DIAMETER_BASE_RESULT-CODE_APPLICATION_UNSUPPORTED').
 -define(INVALID_HDR_BITS,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_INVALID_HDR_BITS').
+        ?'DIAMETER_BASE_RESULT-CODE_INVALID_HDR_BITS').
 -define(INVALID_AVP_BITS,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_INVALID_AVP_BITS').
+        ?'DIAMETER_BASE_RESULT-CODE_INVALID_AVP_BITS').
 -define(AVP_UNSUPPORTED,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_AVP_UNSUPPORTED').
+        ?'DIAMETER_BASE_RESULT-CODE_AVP_UNSUPPORTED').
 -define(UNSUPPORTED_VERSION,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_UNSUPPORTED_VERSION').
+        ?'DIAMETER_BASE_RESULT-CODE_UNSUPPORTED_VERSION').
 -define(REALM_NOT_SERVED,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_REALM_NOT_SERVED').
+        ?'DIAMETER_BASE_RESULT-CODE_REALM_NOT_SERVED').
 -define(UNABLE_TO_DELIVER,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_UNABLE_TO_DELIVER').
+        ?'DIAMETER_BASE_RESULT-CODE_UNABLE_TO_DELIVER').
 -define(INVALID_AVP_LENGTH,
-        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_INVALID_AVP_LENGTH').
+        ?'DIAMETER_BASE_RESULT-CODE_INVALID_AVP_LENGTH').
 
 -define(EVENT_RECORD,
         ?'DIAMETER_BASE_ACCOUNTING-RECORD-TYPE_EVENT_RECORD').
@@ -208,11 +208,11 @@
         ?'DIAMETER_BASE_RE-AUTH-REQUEST-TYPE_AUTHORIZE_AUTHENTICATE').
 
 -define(LOGOUT,
-        ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
+        ?'DIAMETER_BASE_TERMINATION-CAUSE_LOGOUT').
 -define(BAD_ANSWER,
-        ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_BAD_ANSWER').
+        ?'DIAMETER_BASE_TERMINATION-CAUSE_BAD_ANSWER').
 -define(USER_MOVED,
-        ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_USER_MOVED').
+        ?'DIAMETER_BASE_TERMINATION-CAUSE_USER_MOVED').
 
 %% ===========================================================================