Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-10 21:47:01 +02:00
Code Releases Activity

Show received input and expected input in ?recv* macros in case of failure

Browse Source 
Throwing catch clause error is not that good for finding out what happened
This commit is contained in:
Paweł Chmielowski 2015-02-04 14:42:03 +01:00
parent 8732817c3c
commit 2797fa16a6
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/suite.erl
View File

@ -175,6 +175,9 @@ re_register(Config) ->
{atomic, ok} = ejabberd_auth:try_register(User, Server, Pass), {atomic, ok} = ejabberd_auth:try_register(User, Server, Pass),
ok. ok.
match_failure(Received, Matches) ->
ct:fail("Received input:~n~n~p~n~ndon't match expected patterns:~n~n~p", [Received, Matches]).
recv() -> recv() ->
receive receive
{'$gen_event', {xmlstreamelement, El}} -> {'$gen_event', {xmlstreamelement, El}} ->

14
test/suite.hrl
View File

@ -21,7 +21,10 @@
(fun() -> (fun() ->
case {R1 = recv(), R2 = recv()} of case {R1 = recv(), R2 = recv()} of
{P1, P2} -> {R1, R2}; {P1, P2} -> {R1, R2};
{P2, P1} -> {R2, R1} {P2, P1} -> {R2, R1};
{P1, V1} -> suite:match_failure([V1], [P2]);
{P2, V2} -> suite:match_failure([V2], [P1]);
{V3, V4} -> suite:match_failure([V3, V4], [P1, P2])
end end
end)()). end)()).
@ -30,7 +33,8 @@
case R3 = recv() of case R3 = recv() of
P1 -> insert(R3, 1, ?recv2(P2, P3)); P1 -> insert(R3, 1, ?recv2(P2, P3));
P2 -> insert(R3, 2, ?recv2(P1, P3)); P2 -> insert(R3, 2, ?recv2(P1, P3));
P3 -> insert(R3, 3, ?recv2(P1, P2)) P3 -> insert(R3, 3, ?recv2(P1, P2));
V -> suite:match_failure([V], [P1, P2, P3])
end end
end)()). end)()).
@ -40,7 +44,8 @@
P1 -> insert(R4, 1, ?recv3(P2, P3, P4)); P1 -> insert(R4, 1, ?recv3(P2, P3, P4));
P2 -> insert(R4, 2, ?recv3(P1, P3, P4)); P2 -> insert(R4, 2, ?recv3(P1, P3, P4));
P3 -> insert(R4, 3, ?recv3(P1, P2, P4)); P3 -> insert(R4, 3, ?recv3(P1, P2, P4));
P4 -> insert(R4, 4, ?recv3(P1, P2, P3)) P4 -> insert(R4, 4, ?recv3(P1, P2, P3));
V -> suite:match_failure([V], [P1, P2, P3, P4])
end end
end)()). end)()).
@ -51,7 +56,8 @@
P2 -> insert(R5, 2, ?recv4(P1, P3, P4, P5)); P2 -> insert(R5, 2, ?recv4(P1, P3, P4, P5));
P3 -> insert(R5, 3, ?recv4(P1, P2, P4, P5)); P3 -> insert(R5, 3, ?recv4(P1, P2, P4, P5));
P4 -> insert(R5, 4, ?recv4(P1, P2, P3, P5)); P4 -> insert(R5, 4, ?recv4(P1, P2, P3, P5));
P5 -> insert(R5, 5, ?recv4(P1, P2, P3, P4)) P5 -> insert(R5, 5, ?recv4(P1, P2, P3, P4));
V -> suite:match_failure([V], [P1, P2, P3, P4, P5])
end end
end)()). end)()).