Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Fix MAM tests (EJABS-2480).

This commit is contained in:
Jerome Sautret 2015-07-07 18:42:50 +02:00 committed by Evgeniy Khramtsov
parent 2598375051
commit 6604b9efbb
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/ejabberd_SUITE.erl
View File

@ -1663,7 +1663,11 @@ mam_query_all(Config, NS) ->
QID = randoms:get_string(), QID = randoms:get_string(),
MyJID = my_jid(Config), MyJID = my_jid(Config),
Peer = ?config(slave, Config), Peer = ?config(slave, Config),
I = send(Config, #iq{type = get, sub_els = [#mam_query{xmlns = NS, id = QID}]}), Type = case NS of
?NS_MAM_TMP -> get;
_ -> set
end,
I = send(Config, #iq{type = Type, sub_els = [#mam_query{xmlns = NS, id = QID}]}),
maybe_recv_iq_result(NS, I), maybe_recv_iq_result(NS, I),
Iter = if NS == ?NS_MAM_TMP -> lists:seq(1, 5); Iter = if NS == ?NS_MAM_TMP -> lists:seq(1, 5);
true -> lists:seq(1, 5) ++ lists:seq(1, 5) true -> lists:seq(1, 5) ++ lists:seq(1, 5)
@ -1692,15 +1696,15 @@ mam_query_all(Config, NS) ->
mam_query_with(Config, JID, NS) -> mam_query_with(Config, JID, NS) ->
MyJID = my_jid(Config), MyJID = my_jid(Config),
Peer = ?config(slave, Config), Peer = ?config(slave, Config),
Query = if NS == ?NS_MAM_TMP -> {Query, Type} = if NS == ?NS_MAM_TMP ->
#mam_query{xmlns = NS, with = JID}; {#mam_query{xmlns = NS, with = JID}, get};
true -> true ->
Fs = [#xdata_field{var = <<"jid">>, Fs = [#xdata_field{var = <<"jid">>,
values = [jlib:jid_to_string(JID)]}], values = [jlib:jid_to_string(JID)]}],
#mam_query{xmlns = NS, {#mam_query{xmlns = NS,
xdata = #xdata{type = submit, fields = Fs}} xdata = #xdata{type = submit, fields = Fs}}, set}
end, end,
I = send(Config, #iq{type = get, sub_els = [Query]}), I = send(Config, #iq{type = Type, sub_els = [Query]}),
Iter = if NS == ?NS_MAM_TMP -> lists:seq(1, 5); Iter = if NS == ?NS_MAM_TMP -> lists:seq(1, 5);
true -> lists:seq(1, 5) ++ lists:seq(1, 5) true -> lists:seq(1, 5) ++ lists:seq(1, 5)
end, end,
@ -1733,9 +1737,13 @@ maybe_recv_iq_result(_, _) ->
mam_query_rsm(Config, NS) -> mam_query_rsm(Config, NS) ->
MyJID = my_jid(Config), MyJID = my_jid(Config),
Peer = ?config(slave, Config), Peer = ?config(slave, Config),
Type = case NS of
?NS_MAM_TMP -> get;
_ -> set
end,
%% Get the first 3 items out of 5 %% Get the first 3 items out of 5
I1 = send(Config, I1 = send(Config,
#iq{type = get, #iq{type = Type,
sub_els = [#mam_query{xmlns = NS, rsm = #rsm_set{max = 3}}]}), sub_els = [#mam_query{xmlns = NS, rsm = #rsm_set{max = 3}}]}),
maybe_recv_iq_result(NS, I1), maybe_recv_iq_result(NS, I1),
lists:foreach( lists:foreach(
@ -1764,7 +1772,7 @@ mam_query_rsm(Config, NS) ->
%% Get the next items starting from the `Last`. %% Get the next items starting from the `Last`.
%% Limit the response to 2 items. %% Limit the response to 2 items.
I2 = send(Config, I2 = send(Config,
#iq{type = get, #iq{type = Type,
sub_els = [#mam_query{xmlns = NS, sub_els = [#mam_query{xmlns = NS,
rsm = #rsm_set{max = 2, rsm = #rsm_set{max = 2,
'after' = Last}}]}), 'after' = Last}}]}),
@ -1800,7 +1808,7 @@ mam_query_rsm(Config, NS) ->
end, end,
%% Paging back. Should receive 2 elements: 2, 3. %% Paging back. Should receive 2 elements: 2, 3.
I3 = send(Config, I3 = send(Config,
#iq{type = get, #iq{type = Type,
sub_els = [#mam_query{xmlns = NS, sub_els = [#mam_query{xmlns = NS,
rsm = #rsm_set{max = 2, rsm = #rsm_set{max = 2,
before = First}}]}), before = First}}]}),
@ -1829,7 +1837,7 @@ mam_query_rsm(Config, NS) ->
end, end,
%% Getting the item count. Should be 5 (or 10). %% Getting the item count. Should be 5 (or 10).
I4 = send(Config, I4 = send(Config,
#iq{type = get, #iq{type = Type,
sub_els = [#mam_query{xmlns = NS, sub_els = [#mam_query{xmlns = NS,
rsm = #rsm_set{max = 0}}]}), rsm = #rsm_set{max = 0}}]}),
maybe_recv_iq_result(NS, I4), maybe_recv_iq_result(NS, I4),