Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

Add tests for mod_announce

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2014-07-27 13:02:46 +04:00
parent a087af7060
commit abeaac1c11
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/ejabberd_SUITE.erl
View File

@ -206,6 +206,8 @@ db_tests(riak) ->
[offline_master, offline_slave]}, [offline_master, offline_slave]},
{test_muc, [parallel], {test_muc, [parallel],
[muc_master, muc_slave]}, [muc_master, muc_slave]},
{test_announce, [parallel],
[announce_master, announce_slave]},
{test_roster_remove, [parallel], {test_roster_remove, [parallel],
[roster_remove_master, [roster_remove_master,
roster_remove_slave]}]; roster_remove_slave]}];
@ -233,6 +235,8 @@ db_tests(mnesia) ->
[carbons_master, carbons_slave]}, [carbons_master, carbons_slave]},
{test_muc, [parallel], {test_muc, [parallel],
[muc_master, muc_slave]}, [muc_master, muc_slave]},
{test_announce, [parallel],
[announce_master, announce_slave]},
{test_roster_remove, [parallel], {test_roster_remove, [parallel],
[roster_remove_master, [roster_remove_master,
roster_remove_slave]}]; roster_remove_slave]}];
@ -259,6 +263,8 @@ db_tests(_) ->
[offline_master, offline_slave]}, [offline_master, offline_slave]},
{test_muc, [parallel], {test_muc, [parallel],
[muc_master, muc_slave]}, [muc_master, muc_slave]},
{test_announce, [parallel],
[announce_master, announce_slave]},
{test_roster_remove, [parallel], {test_roster_remove, [parallel],
[roster_remove_master, [roster_remove_master,
roster_remove_slave]}]. roster_remove_slave]}].
@ -1273,6 +1279,39 @@ muc_slave(Config) ->
role = none}]}]} = recv(), role = none}]}]} = recv(),
disconnect(Config). disconnect(Config).
announce_master(Config) ->
MyJID = my_jid(Config),
ServerJID = server_jid(Config),
Peer = ?config(slave, Config),
MotdJID = jlib:jid_replace_resource(ServerJID, <<"announce/motd">>),
MotdDelJID = jlib:jid_replace_resource(ServerJID, <<"announce/motd/delete">>),
MotdText = #text{data = <<"motd">>},
send(Config, #presence{}),
#presence{from = MyJID} = recv(),
%% Set message of the day
send(Config, #message{to = MotdJID, body = [MotdText]}),
%% Receive this message back
#message{from = ServerJID, body = [MotdText]} = recv(),
wait_for_slave(Config),
%% Peer becomes available and then unavailable
#presence{from = Peer} = recv(),
#presence{from = Peer, type = unavailable} = recv(),
%% Delete message of the day
send(Config, #message{to = MotdDelJID}),
disconnect(Config).
announce_slave(Config) ->
MyJID = my_jid(Config),
ServerJID = server_jid(Config),
Peer = ?config(master, Config),
MotdText = #text{data = <<"motd">>},
wait_for_master(Config),
send(Config, #presence{}),
?recv3(#presence{from = Peer},
#presence{from = MyJID},
#message{from = ServerJID, body = [MotdText]}),
disconnect(Config).
offline_master(Config) -> offline_master(Config) ->
Peer = ?config(slave, Config), Peer = ?config(slave, Config),
LPeer = jlib:jid_remove_resource(Peer), LPeer = jlib:jid_remove_resource(Peer),

4
test/ejabberd_SUITE_data/ejabberd.yml
View File

@ -11,6 +11,7 @@ host_config:
modules: modules:
mod_announce: mod_announce:
db_type: odbc db_type: odbc
access: local
mod_blocking: mod_blocking:
db_type: odbc db_type: odbc
mod_caps: mod_caps:
@ -64,6 +65,7 @@ Welcome to this XMPP server."
modules: modules:
mod_announce: mod_announce:
db_type: odbc db_type: odbc
access: local
mod_blocking: mod_blocking:
db_type: odbc db_type: odbc
mod_caps: mod_caps:
@ -110,6 +112,7 @@ Welcome to this XMPP server."
modules: modules:
mod_announce: mod_announce:
db_type: internal db_type: internal
access: local
mod_blocking: mod_blocking:
db_type: internal db_type: internal
mod_caps: mod_caps:
@ -158,6 +161,7 @@ Welcome to this XMPP server."
modules: modules:
mod_announce: mod_announce:
db_type: riak db_type: riak
access: local
mod_blocking: mod_blocking:
db_type: riak db_type: riak
mod_caps: mod_caps: