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

2824 lines
101 KiB
Erlang
Raw Normal View History

Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
%%%-------------------------------------------------------------------
%%% @author Evgeniy Khramtsov <ekhramtsov@process-one.net>
Update copyright to 2016 (#901)
2016-01-13 12:29:14 +01:00
%%% @copyright (C) 2002-2016, ProcessOne
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
%%% @doc
%%%
%%% @end
%%% Created : 2 Jun 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
%%%-------------------------------------------------------------------
-module(ejabberd_SUITE).
-compile(export_all).
Split the test suite into modules
2013-06-26 19:55:29 +02:00
-import(suite, [init_config/1, connect/1, disconnect/1,
Improve namespace handling
2016-09-24 13:17:21 +02:00
recv/1, send/2, send_recv/2, my_jid/1, server_jid/1,
Add tests for MIX
2016-03-10 15:42:37 +01:00
pubsub_jid/1, proxy_jid/1, muc_jid/1, muc_room_jid/1,
mix_jid/1, mix_room_jid/1, get_features/2, re_register/1,
Split the test suite into modules
2013-06-26 19:55:29 +02:00
is_feature_advertised/2, subscribe_to_events/1,
is_feature_advertised/3, set_opt/3, auth_SASL/2,
wait_for_master/1, wait_for_slave/1,
make_iq_result/1, start_event_relay/0,
stop_event_relay/1, put_event/2, get_event/1,
Add more tests for C2S
2016-09-20 13:04:07 +02:00
bind/1, auth/1, auth/2, open_session/1, open_session/2,
Add tests for s2s code
2016-09-23 11:30:33 +02:00
zlib/1, starttls/1, starttls/2, close_socket/1, init_stream/1,
auth_legacy/2, auth_legacy/3, tcp_connect/1, send_text/2]).
Split the test suite into modules
2013-06-26 19:55:29 +02:00
-include("suite.hrl").
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
suite() ->
Add tests for s2s code
2016-09-23 11:30:33 +02:00
[{timetrap, {seconds,30}}].
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
init_per_suite(Config) ->
Split the test suite into modules
2013-06-26 19:55:29 +02:00
NewConfig = init_config(Config),
DataDir = proplists:get_value(data_dir, NewConfig),
Better certfile location detection by the test suite
2013-06-14 17:23:57 +02:00
{ok, CWD} = file:get_cwd(),
Split the test suite into modules
2013-06-26 19:55:29 +02:00
ExtAuthScript = filename:join([DataDir, "extauth.py"]),
LDIFFile = filename:join([DataDir, "ejabberd.ldif"]),
Fix external authentication
2013-06-26 04:29:50 +02:00
{ok, _} = file:copy(ExtAuthScript, filename:join([CWD, "extauth.py"])),
Start the LDAP server before ejabberd application
2013-06-25 19:05:37 +02:00
{ok, _} = ldap_srv:start(LDIFFile),
Add tests for s2s code
2016-09-23 11:30:33 +02:00
inet_db:add_host({127,0,0,1}, [binary_to_list(?S2S_VHOST),
binary_to_list(?MNESIA_VHOST)]),
inet_db:set_domain(binary_to_list(randoms:get_string())),
inet_db:set_lookup([file, native]),
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
start_ejabberd(NewConfig),
Split the test suite into modules
2013-06-26 19:55:29 +02:00
NewConfig.
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
start_ejabberd(Config) ->
case proplists:get_value(backends, Config) of
all ->
ok = application:start(ejabberd, transient);
Backends when is_list(Backends) ->
Hosts = lists:map(fun(Backend) -> Backend ++ ".localhost" end, Backends),
application:load(ejabberd),
AllHosts = Hosts ++ ["localhost"], %% We always need localhost for the generic no_db tests
application:set_env(ejabberd, hosts, AllHosts),
ok = application:start(ejabberd, transient)
end.
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
end_per_suite(_Config) ->
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
application:stop(ejabberd).
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
-define(BACKENDS, [mnesia,redis,mysql,pgsql,sqlite,ldap,extauth,riak]).
init_per_group(Group, Config) ->
case lists:member(Group, ?BACKENDS) of
false ->
%% Not a backend related group, do default init:
do_init_per_group(Group, Config);
true ->
case proplists:get_value(backends, Config) of
all ->
%% All backends enabled
do_init_per_group(Group, Config);
Backends ->
%% Skipped backends that were not explicitely enabled
case lists:member(atom_to_list(Group), Backends) of
true ->
do_init_per_group(Group, Config);
false ->
{skip, {disabled_backend, Group}}
end
end
end.
do_init_per_group(no_db, Config) ->
Split the test suite into modules
2013-06-26 19:55:29 +02:00
re_register(Config),
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
Config;
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
do_init_per_group(mnesia, Config) ->
Shutdown rooms before starting test cases
2013-06-19 13:30:31 +02:00
mod_muc:shutdown_rooms(?MNESIA_VHOST),
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
set_opt(server, ?MNESIA_VHOST, Config);
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
do_init_per_group(redis, Config) ->
Add Redis backend to the test suite
2016-02-19 15:06:41 +01:00
mod_muc:shutdown_rooms(?REDIS_VHOST),
set_opt(server, ?REDIS_VHOST, Config);
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
do_init_per_group(mysql, Config) ->
Rename odbc to sql everywhere
2016-04-20 11:27:32 +02:00
case catch ejabberd_sql:sql_query(?MYSQL_VHOST, [<<"select 1;">>]) of
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
{selected, _, _} ->
Shutdown rooms before starting test cases
2013-06-19 13:30:31 +02:00
mod_muc:shutdown_rooms(?MYSQL_VHOST),
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
create_sql_tables(mysql, ?config(base_dir, Config)),
set_opt(server, ?MYSQL_VHOST, Config);
Err ->
{skip, {mysql_not_available, Err}}
end;
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
do_init_per_group(pgsql, Config) ->
Rename odbc to sql everywhere
2016-04-20 11:27:32 +02:00
case catch ejabberd_sql:sql_query(?PGSQL_VHOST, [<<"select 1;">>]) of
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
{selected, _, _} ->
Shutdown rooms before starting test cases
2013-06-19 13:30:31 +02:00
mod_muc:shutdown_rooms(?PGSQL_VHOST),
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
create_sql_tables(pgsql, ?config(base_dir, Config)),
set_opt(server, ?PGSQL_VHOST, Config);
Err ->
{skip, {pgsql_not_available, Err}}
end;
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
do_init_per_group(sqlite, Config) ->
Rename odbc to sql everywhere
2016-04-20 11:27:32 +02:00
case catch ejabberd_sql:sql_query(?SQLITE_VHOST, [<<"select 1;">>]) of
Add SQLite support
2015-03-16 19:53:19 +01:00
{selected, _, _} ->
mod_muc:shutdown_rooms(?SQLITE_VHOST),
set_opt(server, ?SQLITE_VHOST, Config);
Err ->
{skip, {sqlite_not_available, Err}}
end;
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
do_init_per_group(ldap, Config) ->
Add LDAP test cases
2013-06-21 19:23:56 +02:00
set_opt(server, ?LDAP_VHOST, Config);
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
do_init_per_group(extauth, Config) ->
Fix external authentication
2013-06-26 04:29:50 +02:00
set_opt(server, ?EXTAUTH_VHOST, Config);
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
do_init_per_group(riak, Config) ->
Check Riak connection before running the corresponding suite
2014-07-09 20:59:45 +02:00
case ejabberd_riak:is_connected() of
true ->
mod_muc:shutdown_rooms(?RIAK_VHOST),
NewConfig = set_opt(server, ?RIAK_VHOST, Config),
clear_riak_tables(NewConfig);
Err ->
{skip, {riak_not_available, Err}}
end;
Add tests for s2s code
2016-09-23 11:30:33 +02:00
do_init_per_group(s2s, Config) ->
ejabberd_config:add_option(s2s_use_starttls, required_trusted),
ejabberd_config:add_option(domain_certfile, "cert.pem"),
Port = ?config(s2s_port, Config),
set_opt(server, ?COMMON_VHOST,
set_opt(xmlns, ?NS_SERVER,
set_opt(type, server,
set_opt(server_port, Port,
set_opt(stream_from, ?S2S_VHOST,
set_opt(lang, <<"">>, Config))))));
Add tests for external component
2016-09-21 09:45:11 +02:00
do_init_per_group(component, Config) ->
Server = ?config(server, Config),
Port = ?config(component_port, Config),
set_opt(xmlns, ?NS_COMPONENT,
set_opt(server, <<"component.", Server/binary>>,
set_opt(type, component,
set_opt(server_port, Port,
Add tests for s2s code
2016-09-23 11:30:33 +02:00
set_opt(stream_version, undefined,
Add tests for external component
2016-09-21 09:45:11 +02:00
set_opt(lang, <<"">>, Config))))));
Test anonymous auth
2016-09-25 08:57:56 +02:00
do_init_per_group(GroupName, Config) ->
Add roster checks
2013-06-15 15:28:14 +02:00
Pid = start_event_relay(),
Test anonymous auth
2016-09-25 08:57:56 +02:00
NewConfig = set_opt(event_relay, Pid, Config),
case GroupName of
anonymous -> set_opt(anonymous, true, NewConfig);
_ -> NewConfig
end.
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
end_per_group(mnesia, _Config) ->
ok;
Add Redis backend to the test suite
2016-02-19 15:06:41 +01:00
end_per_group(redis, _Config) ->
ok;
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
end_per_group(mysql, _Config) ->
ok;
end_per_group(pgsql, _Config) ->
ok;
Add SQLite support
2015-03-16 19:53:19 +01:00
end_per_group(sqlite, _Config) ->
ok;
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
end_per_group(no_db, _Config) ->
ok;
Add LDAP test cases
2013-06-21 19:23:56 +02:00
end_per_group(ldap, _Config) ->
ok;
Fix external authentication
2013-06-26 04:29:50 +02:00
end_per_group(extauth, _Config) ->
ok;
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
end_per_group(riak, _Config) ->
ok;
Add tests for external component
2016-09-21 09:45:11 +02:00
end_per_group(component, _Config) ->
ok;
Add tests for s2s code
2016-09-23 11:30:33 +02:00
end_per_group(s2s, _Config) ->
ejabberd_config:add_option(s2s_use_starttls, false);
Add roster checks
2013-06-15 15:28:14 +02:00
end_per_group(_GroupName, Config) ->
stop_event_relay(Config),
Test anonymous auth
2016-09-25 08:57:56 +02:00
set_opt(anonymous, false, Config).
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
init_per_testcase(stop_ejabberd, Config) ->
Add roster checks
2013-06-15 15:28:14 +02:00
open_session(bind(auth(connect(Config))));
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
init_per_testcase(TestCase, OrigConfig) ->
Add roster checks
2013-06-15 15:28:14 +02:00
subscribe_to_events(OrigConfig),
Add more tests for C2S
2016-09-20 13:04:07 +02:00
TestGroup = proplists:get_value(
name, ?config(tc_group_properties, OrigConfig)),
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
Server = ?config(server, OrigConfig),
Add more tests for C2S
2016-09-20 13:04:07 +02:00
Resource = case TestGroup of
Test anonymous auth
2016-09-25 08:57:56 +02:00
anonymous ->
<<"">>;
Add more tests for C2S
2016-09-20 13:04:07 +02:00
legacy_auth ->
randoms:get_string();
_ ->
?config(resource, OrigConfig)
end,
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
MasterResource = ?config(master_resource, OrigConfig),
SlaveResource = ?config(slave_resource, OrigConfig),
Add roster checks
2013-06-15 15:28:14 +02:00
Test = atom_to_list(TestCase),
IsMaster = lists:suffix("_master", Test),
IsSlave = lists:suffix("_slave", Test),
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
IsCarbons = lists:prefix("carbons_", Test),
Add more tests for C2S
2016-09-20 13:04:07 +02:00
IsReplaced = lists:prefix("replaced_", Test),
User = if IsReplaced -> <<"test_single!#$%^*()`~+-;_=[]{}|\\">>;
IsMaster or IsCarbons -> <<"test_master!#$%^*()`~+-;_=[]{}|\\">>;
Stronger tests in the test suite, SQL updates and fixes
2016-05-24 17:44:07 +02:00
IsSlave -> <<"test_slave!#$%^*()`~+-;_=[]{}|\\">>;
true -> <<"test_single!#$%^*()`~+-;_=[]{}|\\">>
Add roster checks
2013-06-15 15:28:14 +02:00
end,
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
MyResource = if IsMaster and IsCarbons -> MasterResource;
IsSlave and IsCarbons -> SlaveResource;
true -> Resource
end,
Slave = if IsCarbons ->
Stronger tests in the test suite, SQL updates and fixes
2016-05-24 17:44:07 +02:00
jid:make(<<"test_master!#$%^*()`~+-;_=[]{}|\\">>, Server, SlaveResource);
Add more tests for C2S
2016-09-20 13:04:07 +02:00
IsReplaced ->
jid:make(User, Server, Resource);
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
true ->
Stronger tests in the test suite, SQL updates and fixes
2016-05-24 17:44:07 +02:00
jid:make(<<"test_slave!#$%^*()`~+-;_=[]{}|\\">>, Server, Resource)
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
end,
Master = if IsCarbons ->
Stronger tests in the test suite, SQL updates and fixes
2016-05-24 17:44:07 +02:00
jid:make(<<"test_master!#$%^*()`~+-;_=[]{}|\\">>, Server, MasterResource);
Add more tests for C2S
2016-09-20 13:04:07 +02:00
IsReplaced ->
jid:make(User, Server, Resource);
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
true ->
Stronger tests in the test suite, SQL updates and fixes
2016-05-24 17:44:07 +02:00
jid:make(<<"test_master!#$%^*()`~+-;_=[]{}|\\">>, Server, Resource)
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
end,
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
Config = set_opt(user, User,
set_opt(slave, Slave,
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
set_opt(master, Master,
set_opt(resource, MyResource, OrigConfig)))),
Add more tests for C2S
2016-09-20 13:04:07 +02:00
case Test of
"test_connect" ++ _ ->
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
Config;
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"test_legacy_auth" ++ _ ->
Add tests for s2s code
2016-09-23 11:30:33 +02:00
init_stream(set_opt(stream_version, undefined, Config));
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"test_auth" ++ _ ->
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
connect(Config);
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"test_starttls" ++ _ ->
Add STARTTLS test case
2013-06-14 16:16:32 +02:00
connect(Config);
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"test_zlib" ->
Add zlib compression test case
2013-06-14 16:45:04 +02:00
connect(Config);
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"test_register" ->
Add mod_register checks
2013-06-14 10:47:50 +02:00
connect(Config);
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"auth_md5" ->
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
connect(Config);
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"auth_plain" ->
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
connect(Config);
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"unauthenticated_" ++ _ ->
connect(Config);
"test_bind" ->
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
auth(connect(Config));
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"sm_resume" ->
Add tests for session management
2014-07-22 11:59:31 +02:00
auth(connect(Config));
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"sm_resume_failed" ->
XEP-0198: Add 'h' attribute to <failed/> element If a resume request is rejected because the session timed out, indicate the number of handled stanzas as per version 1.5 of XEP-0198.
2016-05-24 22:20:58 +02:00
auth(connect(Config));
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"test_open_session" ->
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
bind(auth(connect(Config)));
Add more tests for C2S
2016-09-20 13:04:07 +02:00
"replaced" ++ _ ->
auth(connect(Config));
Add roster checks
2013-06-15 15:28:14 +02:00
_ when IsMaster or IsSlave ->
Password = ?config(password, Config),
ejabberd_auth:try_register(User, Server, Password),
open_session(bind(auth(connect(Config))));
Add tests for s2s code
2016-09-23 11:30:33 +02:00
_ when TestGroup == s2s_tests ->
auth(connect(starttls(connect(Config))));
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
_ ->
open_session(bind(auth(connect(Config))))
end.
end_per_testcase(_TestCase, _Config) ->
ok.
Add more tests for C2S
2016-09-20 13:04:07 +02:00
legacy_auth_tests() ->
{legacy_auth, [parallel],
[test_legacy_auth,
test_legacy_auth_digest,
test_legacy_auth_no_resource,
test_legacy_auth_bad_jid,
test_legacy_auth_fail]}.
Add LDAP test cases
2013-06-21 19:23:56 +02:00
no_db_tests() ->
Test anonymous auth
2016-09-25 08:57:56 +02:00
[{anonymous, [parallel],
Add more tests for C2S
2016-09-20 13:04:07 +02:00
[test_connect_bad_xml,
Add tests for s2s code
2016-09-23 11:30:33 +02:00
test_connect_unexpected_xml,
Add more tests for C2S
2016-09-20 13:04:07 +02:00
test_connect_unknown_ns,
Add tests for external component
2016-09-21 09:45:11 +02:00
test_connect_bad_xmlns,
Add more tests for C2S
2016-09-20 13:04:07 +02:00
test_connect_bad_ns_stream,
test_connect_bad_lang,
test_connect_bad_to,
test_connect_missing_to,
test_connect,
unauthenticated_iq,
unauthenticated_stanza,
Test suite cleanup. * Split test cases in groups. * Increase a loglevel of common_test framework.
2013-06-14 18:35:14 +02:00
test_starttls,
test_zlib,
test_auth,
test_bind,
test_open_session,
Add more tests for C2S
2016-09-20 13:04:07 +02:00
codec_failure,
unsupported_query,
bad_nonza,
invalid_from,
Test suite cleanup. * Split test cases in groups. * Increase a loglevel of common_test framework.
2013-06-14 18:35:14 +02:00
ping,
version,
time,
stats,
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
disco]},
Add tests for s2s code
2016-09-23 11:30:33 +02:00
{presence_and_s2s, [sequence],
Test anonymous auth
2016-09-25 08:57:56 +02:00
[test_auth_fail,
presence,
Add tests for s2s code
2016-09-23 11:30:33 +02:00
s2s_dialback,
s2s_optional,
s2s_required,
s2s_required_trusted]},
Add more tests for C2S
2016-09-20 13:04:07 +02:00
{sm, [sequence],
[sm,
sm_resume,
sm_resume_failed]},
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
{test_proxy65, [parallel],
Add more tests for C2S
2016-09-20 13:04:07 +02:00
[proxy65_master, proxy65_slave]},
{replaced, [parallel],
[replaced_master, replaced_slave]}].
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
db_tests(riak) ->
%% No support for mod_pubsub
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
[{single_user, [sequence],
[test_register,
Add more tests for C2S
2016-09-20 13:04:07 +02:00
legacy_auth_tests(),
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
auth_plain,
auth_md5,
presence_broadcast,
Test suite cleanup. * Split test cases in groups. * Increase a loglevel of common_test framework.
2013-06-14 18:35:14 +02:00
last,
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
roster_get,
Test suite cleanup. * Split test cases in groups. * Increase a loglevel of common_test framework.
2013-06-14 18:35:14 +02:00
private,
privacy,
blocking,
vcard,
Add roster checks
2013-06-15 15:28:14 +02:00
test_unregister]},
Test MUC nick registration
2014-09-03 19:28:07 +02:00
{test_muc_register, [sequence],
[muc_register_master, muc_register_slave]},
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
{test_roster_subscribe, [parallel],
[roster_subscribe_master,
roster_subscribe_slave]},
Add tests for XEP-0013
2016-02-10 14:15:43 +01:00
{test_flex_offline, [sequence],
[flex_offline_master, flex_offline_slave]},
Add simple mod_offline checks
2013-06-17 09:15:27 +02:00
{test_offline, [sequence],
[offline_master, offline_slave]},
Improve MUC test cases
2014-07-19 15:23:13 +02:00
{test_muc, [parallel],
[muc_master, muc_slave]},
Reorganize mod_announce test in order to avoid race
2014-07-28 11:42:29 +02:00
{test_announce, [sequence],
Add tests for mod_announce
2014-07-27 11:02:46 +02:00
[announce_master, announce_slave]},
Add tests for mod_vcard_xupdate
2014-10-30 21:54:02 +01:00
{test_vcard_xupdate, [parallel],
[vcard_xupdate_master, vcard_xupdate_slave]},
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
{test_roster_remove, [parallel],
[roster_remove_master,
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
roster_remove_slave]}];
Add Redis backend to the test suite
2016-02-19 15:06:41 +01:00
db_tests(DB) when DB == mnesia; DB == redis ->
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
[{single_user, [sequence],
[test_register,
Add more tests for C2S
2016-09-20 13:04:07 +02:00
legacy_auth_tests(),
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
auth_plain,
auth_md5,
presence_broadcast,
last,
roster_get,
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
roster_ver,
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
private,
privacy,
blocking,
vcard,
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
pubsub,
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
test_unregister]},
Test MUC nick registration
2014-09-03 19:28:07 +02:00
{test_muc_register, [sequence],
[muc_register_master, muc_register_slave]},
Add tests for MIX
2016-03-10 15:42:37 +01:00
{test_mix, [parallel],
[mix_master, mix_slave]},
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
{test_roster_subscribe, [parallel],
[roster_subscribe_master,
roster_subscribe_slave]},
Add tests for XEP-0013
2016-02-10 14:15:43 +01:00
{test_flex_offline, [sequence],
[flex_offline_master, flex_offline_slave]},
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
{test_offline, [sequence],
[offline_master, offline_slave]},
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
{test_old_mam, [parallel],
[mam_old_master, mam_old_slave]},
{test_new_mam, [parallel],
[mam_new_master, mam_new_slave]},
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
{test_carbons, [parallel],
[carbons_master, carbons_slave]},
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
{test_client_state, [parallel],
[client_state_master, client_state_slave]},
Improve MUC test cases
2014-07-19 15:23:13 +02:00
{test_muc, [parallel],
[muc_master, muc_slave]},
Add tests for MUC MAM
2016-05-01 11:48:23 +02:00
{test_muc_mam, [parallel],
[muc_mam_master, muc_mam_slave]},
Reorganize mod_announce test in order to avoid race
2014-07-28 11:42:29 +02:00
{test_announce, [sequence],
Add tests for mod_announce
2014-07-27 11:02:46 +02:00
[announce_master, announce_slave]},
Add tests for mod_vcard_xupdate
2014-10-30 21:54:02 +01:00
{test_vcard_xupdate, [parallel],
[vcard_xupdate_master, vcard_xupdate_slave]},
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
{test_roster_remove, [parallel],
[roster_remove_master,
roster_remove_slave]}];
db_tests(_) ->
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
%% No support for carboncopy
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
[{single_user, [sequence],
[test_register,
Add more tests for C2S
2016-09-20 13:04:07 +02:00
legacy_auth_tests(),
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
auth_plain,
auth_md5,
presence_broadcast,
last,
roster_get,
roster_ver,
private,
privacy,
blocking,
vcard,
pubsub,
test_unregister]},
Test MUC nick registration
2014-09-03 19:28:07 +02:00
{test_muc_register, [sequence],
[muc_register_master, muc_register_slave]},
Add ODBC tests for MIX
2016-03-13 11:16:55 +01:00
{test_mix, [parallel],
[mix_master, mix_slave]},
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
{test_roster_subscribe, [parallel],
[roster_subscribe_master,
roster_subscribe_slave]},
Add tests for XEP-0013
2016-02-10 14:15:43 +01:00
{test_flex_offline, [sequence],
[flex_offline_master, flex_offline_slave]},
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
{test_offline, [sequence],
[offline_master, offline_slave]},
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
{test_old_mam, [parallel],
[mam_old_master, mam_old_slave]},
{test_new_mam, [parallel],
[mam_new_master, mam_new_slave]},
Improve MUC test cases
2014-07-19 15:23:13 +02:00
{test_muc, [parallel],
[muc_master, muc_slave]},
Add tests for MUC MAM
2016-05-01 11:48:23 +02:00
{test_muc_mam, [parallel],
[muc_mam_master, muc_mam_slave]},
Reorganize mod_announce test in order to avoid race
2014-07-28 11:42:29 +02:00
{test_announce, [sequence],
Add tests for mod_announce
2014-07-27 11:02:46 +02:00
[announce_master, announce_slave]},
Add tests for mod_vcard_xupdate
2014-10-30 21:54:02 +01:00
{test_vcard_xupdate, [parallel],
[vcard_xupdate_master, vcard_xupdate_slave]},
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
{test_roster_remove, [parallel],
[roster_remove_master,
roster_remove_slave]}].
Add LDAP test cases
2013-06-21 19:23:56 +02:00
ldap_tests() ->
[{ldap_tests, [sequence],
[test_auth,
Add more tests for C2S
2016-09-20 13:04:07 +02:00
test_auth_fail,
Add test to demonstrate issue to retrieve roster with mod_shared_roster_ldap
2016-03-25 17:30:12 +01:00
vcard_get,
Proper naming for LDAP test function for shared roster
2016-03-25 17:42:58 +01:00
ldap_shared_roster_get]}].
Add LDAP test cases
2013-06-21 19:23:56 +02:00
Fix external authentication
2013-06-26 04:29:50 +02:00
extauth_tests() ->
[{extauth_tests, [sequence],
[test_auth,
Add more tests for C2S
2016-09-20 13:04:07 +02:00
test_auth_fail,
Fix external authentication
2013-06-26 04:29:50 +02:00
test_unregister]}].
Add tests for external component
2016-09-21 09:45:11 +02:00
component_tests() ->
Add tests for s2s code
2016-09-23 11:30:33 +02:00
[{component_connect, [parallel],
Add tests for external component
2016-09-21 09:45:11 +02:00
[test_connect_bad_xml,
Add tests for s2s code
2016-09-23 11:30:33 +02:00
test_connect_unexpected_xml,
Add tests for external component
2016-09-21 09:45:11 +02:00
test_connect_unknown_ns,
test_connect_bad_xmlns,
test_connect_bad_ns_stream,
test_connect_missing_to,
test_connect,
test_auth,
Add tests for s2s code
2016-09-23 11:30:33 +02:00
test_auth_fail]},
{component_tests, [sequence],
[test_missing_address,
test_invalid_from,
test_component_send,
bad_nonza,
codec_failure]}].
s2s_tests() ->
[{s2s_connect, [parallel],
[test_connect_bad_xml,
test_connect_unexpected_xml,
test_connect_unknown_ns,
test_connect_bad_xmlns,
test_connect_bad_ns_stream,
test_connect,
test_connect_s2s_starttls_required,
test_starttls,
test_connect_missing_from,
test_connect_s2s_unauthenticated_iq,
test_auth_starttls]},
{s2s_tests, [sequence],
[test_missing_address,
test_invalid_from,
Add tests for external component
2016-09-21 09:45:11 +02:00
bad_nonza,
codec_failure]}].
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
groups() ->
Add LDAP test cases
2013-06-21 19:23:56 +02:00
[{ldap, [sequence], ldap_tests()},
Fix external authentication
2013-06-26 04:29:50 +02:00
{extauth, [sequence], extauth_tests()},
Add LDAP test cases
2013-06-21 19:23:56 +02:00
{no_db, [sequence], no_db_tests()},
Add tests for external component
2016-09-21 09:45:11 +02:00
{component, [sequence], component_tests()},
Add tests for s2s code
2016-09-23 11:30:33 +02:00
{s2s, [sequence], s2s_tests()},
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
{mnesia, [sequence], db_tests(mnesia)},
Add Redis backend to the test suite
2016-02-19 15:06:41 +01:00
{redis, [sequence], db_tests(redis)},
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
{mysql, [sequence], db_tests(mysql)},
{pgsql, [sequence], db_tests(pgsql)},
Add SQLite support
2015-03-16 19:53:19 +01:00
{sqlite, [sequence], db_tests(sqlite)},
Add Riak backend to the testing suit
2014-07-09 14:38:45 +02:00
{riak, [sequence], db_tests(riak)}].
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
all() ->
Test anonymous auth
2016-09-25 08:57:56 +02:00
[%%{group, ldap},
Add LDAP test cases
2013-06-21 19:23:56 +02:00
{group, no_db},
Test anonymous auth
2016-09-25 08:57:56 +02:00
%% {group, mnesia},
%% {group, redis},
%% {group, mysql},
%% {group, pgsql},
%% {group, sqlite},
%% {group, extauth},
%% {group, riak},
%% {group, component},
%% {group, s2s},
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
stop_ejabberd].
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
stop_ejabberd(Config) ->
ok = application:stop(ejabberd),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#stream_error{reason = 'system-shutdown'}),
?recv1({xmlstreamend, <<"stream:stream">>}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
Config.
Add more tests for C2S
2016-09-20 13:04:07 +02:00
test_connect_bad_xml(Config) ->
Add tests for s2s code
2016-09-23 11:30:33 +02:00
Config0 = tcp_connect(Config),
send_text(Config0, <<"<'/>">>),
Version = ?config(stream_version, Config0),
?recv1(#stream_start{version = Version}),
Add more tests for C2S
2016-09-20 13:04:07 +02:00
?recv1(#stream_error{reason = 'not-well-formed'}),
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config0).
Add tests for s2s code
2016-09-23 11:30:33 +02:00
test_connect_unexpected_xml(Config) ->
Config0 = tcp_connect(Config),
send(Config0, #caps{}),
Version = ?config(stream_version, Config0),
?recv1(#stream_start{version = Version}),
?recv1(#stream_error{reason = 'invalid-xml'}),
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config0).
Add more tests for C2S
2016-09-20 13:04:07 +02:00
test_connect_unknown_ns(Config) ->
Add tests for external component
2016-09-21 09:45:11 +02:00
Config0 = init_stream(set_opt(xmlns, <<"wrong">>, Config)),
?recv1(#stream_error{reason = 'invalid-xml'}),
Add more tests for C2S
2016-09-20 13:04:07 +02:00
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config0).
Add tests for external component
2016-09-21 09:45:11 +02:00
test_connect_bad_xmlns(Config) ->
Add tests for s2s code
2016-09-23 11:30:33 +02:00
NS = case ?config(type, Config) of
client -> ?NS_SERVER;
_ -> ?NS_CLIENT
end,
Config0 = init_stream(set_opt(xmlns, NS, Config)),
Add more tests for C2S
2016-09-20 13:04:07 +02:00
?recv1(#stream_error{reason = 'invalid-namespace'}),
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config0).
test_connect_bad_ns_stream(Config) ->
Config0 = init_stream(set_opt(ns_stream, <<"wrong">>, Config)),
?recv1(#stream_error{reason = 'invalid-namespace'}),
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config0).
test_connect_bad_lang(Config) ->
Config0 = init_stream(set_opt(lang, lists:duplicate(36, $x), Config)),
?recv1(#stream_error{reason = 'policy-violation'}),
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config0).
test_connect_bad_to(Config) ->
Config0 = init_stream(set_opt(server, <<"wrong.com">>, Config)),
?recv1(#stream_error{reason = 'host-unknown'}),
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config0).
test_connect_missing_to(Config) ->
Config0 = init_stream(set_opt(server, <<"">>, Config)),
?recv1(#stream_error{reason = 'improper-addressing'}),
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config0).
Add tests for s2s code
2016-09-23 11:30:33 +02:00
test_connect_missing_from(Config) ->
Config1 = starttls(connect(Config)),
Config2 = set_opt(stream_from, <<"">>, Config1),
Config3 = init_stream(Config2),
?recv1(#stream_error{reason = 'policy-violation'}),
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config3).
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
test_connect(Config) ->
disconnect(connect(Config)).
Add tests for s2s code
2016-09-23 11:30:33 +02:00
test_connect_s2s_starttls_required(Config) ->
Config1 = connect(Config),
send(Config1, #caps{}),
?recv1(#stream_error{reason = 'policy-violation'}),
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config1).
Add tests for external component
2016-09-21 09:45:11 +02:00
Add tests for s2s code
2016-09-23 11:30:33 +02:00
test_connect_s2s_unauthenticated_iq(Config) ->
Config1 = connect(starttls(connect(Config))),
unauthenticated_iq(Config1).
Add tests for external component
2016-09-21 09:45:11 +02:00
Add STARTTLS test case
2013-06-14 16:16:32 +02:00
test_starttls(Config) ->
case ?config(starttls, Config) of
true ->
Add tests for s2s code
2016-09-23 11:30:33 +02:00
disconnect(connect(starttls(Config)));
Add STARTTLS test case
2013-06-14 16:16:32 +02:00
_ ->
{skipped, 'starttls_not_available'}
end.
Add zlib compression test case
2013-06-14 16:45:04 +02:00
test_zlib(Config) ->
case ?config(compression, Config) of
[_|_] = Ms ->
case lists:member(<<"zlib">>, Ms) of
true ->
Test suite cleanup. * Split test cases in groups. * Increase a loglevel of common_test framework.
2013-06-14 18:35:14 +02:00
disconnect(zlib(Config));
Add zlib compression test case
2013-06-14 16:45:04 +02:00
false ->
{skipped, 'zlib_not_available'}
end;
_ ->
{skipped, 'compression_not_available'}
end.
Add STARTTLS test case
2013-06-14 16:16:32 +02:00
test_register(Config) ->
Add mod_register checks
2013-06-14 10:47:50 +02:00
case ?config(register, Config) of
true ->
Test suite cleanup. * Split test cases in groups. * Increase a loglevel of common_test framework.
2013-06-14 18:35:14 +02:00
disconnect(register(Config));
Add STARTTLS test case
2013-06-14 16:16:32 +02:00
_ ->
{skipped, 'registration_not_available'}
Add mod_register checks
2013-06-14 10:47:50 +02:00
end.
Add STARTTLS test case
2013-06-14 16:16:32 +02:00
register(Config) ->
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#register{username = <<>>,
password = <<>>}]} =
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
send_recv(Config, #iq{type = get, to = server_jid(Config),
sub_els = [#register{}]}),
#iq{type = result, sub_els = []} =
send_recv(
Config,
#iq{type = set,
sub_els = [#register{username = ?config(user, Config),
password = ?config(password, Config)}]}),
Test suite cleanup. * Split test cases in groups. * Increase a loglevel of common_test framework.
2013-06-14 18:35:14 +02:00
Config.
Add mod_register checks
2013-06-14 10:47:50 +02:00
Add registration remove test case
2013-06-14 18:58:26 +02:00
test_unregister(Config) ->
case ?config(register, Config) of
true ->
Improve "unregister" test case
2013-06-14 19:22:36 +02:00
try_unregister(Config);
Add registration remove test case
2013-06-14 18:58:26 +02:00
_ ->
{skipped, 'registration_not_available'}
end.
try_unregister(Config) ->
Improve "unregister" test case
2013-06-14 19:22:36 +02:00
true = is_feature_advertised(Config, ?NS_REGISTER),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = []} =
send_recv(
Config,
#iq{type = set,
sub_els = [#register{remove = true}]}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#stream_error{reason = conflict}),
Add registration remove test case
2013-06-14 18:58:26 +02:00
Config.
Add more tests for C2S
2016-09-20 13:04:07 +02:00
unauthenticated_stanza(Config) ->
%% Unauthenticated stanza should be silently dropped.
send(Config, #message{to = server_jid(Config)}),
disconnect(Config).
unauthenticated_iq(Config) ->
Add tests for s2s code
2016-09-23 11:30:33 +02:00
From = my_jid(Config),
To = server_jid(Config),
Add more tests for C2S
2016-09-20 13:04:07 +02:00
#iq{type = error} =
Add tests for s2s code
2016-09-23 11:30:33 +02:00
send_recv(Config, #iq{type = get, from = From, to = To,
sub_els = [#disco_info{}]}),
Add more tests for C2S
2016-09-20 13:04:07 +02:00
disconnect(Config).
bad_nonza(Config) ->
%% Unsupported and invalid nonza should be silently dropped.
send(Config, #caps{}),
send(Config, #stanza_error{type = wrong}),
disconnect(Config).
invalid_from(Config) ->
send(Config, #message{from = jid:make(randoms:get_string())}),
?recv1(#stream_error{reason = 'invalid-from'}),
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config).
Add tests for s2s code
2016-09-23 11:30:33 +02:00
test_missing_address(Config) ->
Add tests for external component
2016-09-21 09:45:11 +02:00
Server = server_jid(Config),
#iq{type = error} = send_recv(Config, #iq{type = get, from = Server}),
#iq{type = error} = send_recv(Config, #iq{type = get, to = Server}),
disconnect(Config).
Add tests for s2s code
2016-09-23 11:30:33 +02:00
test_invalid_from(Config) ->
Add tests for external component
2016-09-21 09:45:11 +02:00
From = jid:make(randoms:get_string()),
To = jid:make(randoms:get_string()),
#iq{type = error} =
send_recv(Config, #iq{type = get, from = From, to = To}),
disconnect(Config).
Add tests for s2s code
2016-09-23 11:30:33 +02:00
test_component_send(Config) ->
To = jid:make(?COMMON_VHOST),
From = server_jid(Config),
#iq{type = result, from = To, to = From} =
send_recv(Config, #iq{type = get, to = To, from = From,
sub_els = [#ping{}]}),
disconnect(Config).
s2s_dialback(Config) ->
ejabberd_s2s:stop_all_connections(),
ejabberd_config:add_option(s2s_use_starttls, false),
ejabberd_config:add_option(domain_certfile, "self-signed-cert.pem"),
s2s_ping(Config).
s2s_optional(Config) ->
ejabberd_s2s:stop_all_connections(),
ejabberd_config:add_option(s2s_use_starttls, optional),
ejabberd_config:add_option(domain_certfile, "self-signed-cert.pem"),
s2s_ping(Config).
s2s_required(Config) ->
ejabberd_s2s:stop_all_connections(),
ejabberd_config:add_option(s2s_use_starttls, required),
ejabberd_config:add_option(domain_certfile, "self-signed-cert.pem"),
s2s_ping(Config).
s2s_required_trusted(Config) ->
ejabberd_s2s:stop_all_connections(),
ejabberd_config:add_option(s2s_use_starttls, required),
ejabberd_config:add_option(domain_certfile, "cert.pem"),
s2s_ping(Config).
s2s_ping(Config) ->
From = my_jid(Config),
To = jid:make(?MNESIA_VHOST),
ID = randoms:get_string(),
ejabberd_s2s:route(From, To, #iq{id = ID, type = get, sub_els = [#ping{}]}),
?recv1(#iq{type = result, id = ID, sub_els = []}),
Add tests for external component
2016-09-21 09:45:11 +02:00
disconnect(Config).
Split the test suite into modules
2013-06-26 19:55:29 +02:00
auth_md5(Config) ->
Mechs = ?config(mechs, Config),
case lists:member(<<"DIGEST-MD5">>, Mechs) of
true ->
disconnect(auth_SASL(<<"DIGEST-MD5">>, Config));
false ->
disconnect(Config),
{skipped, 'DIGEST-MD5_not_available'}
end.
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
Split the test suite into modules
2013-06-26 19:55:29 +02:00
auth_plain(Config) ->
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
Mechs = ?config(mechs, Config),
Split the test suite into modules
2013-06-26 19:55:29 +02:00
case lists:member(<<"PLAIN">>, Mechs) of
true ->
disconnect(auth_SASL(<<"PLAIN">>, Config));
false ->
disconnect(Config),
{skipped, 'PLAIN_not_available'}
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
end.
Add more tests for C2S
2016-09-20 13:04:07 +02:00
test_legacy_auth(Config) ->
disconnect(auth_legacy(Config, _Digest = false)).
test_legacy_auth_digest(Config) ->
disconnect(auth_legacy(Config, _Digest = true)).
test_legacy_auth_no_resource(Config0) ->
Config = set_opt(resource, <<"">>, Config0),
disconnect(auth_legacy(Config, _Digest = false, _ShouldFail = true)).
test_legacy_auth_bad_jid(Config0) ->
Config = set_opt(user, <<"@">>, Config0),
disconnect(auth_legacy(Config, _Digest = false, _ShouldFail = true)).
test_legacy_auth_fail(Config0) ->
Config = set_opt(user, <<"wrong">>, Config0),
disconnect(auth_legacy(Config, _Digest = false, _ShouldFail = true)).
Split the test suite into modules
2013-06-26 19:55:29 +02:00
test_auth(Config) ->
disconnect(auth(Config)).
Add tests for s2s code
2016-09-23 11:30:33 +02:00
test_auth_starttls(Config) ->
disconnect(auth(connect(starttls(Config)))).
Add more tests for C2S
2016-09-20 13:04:07 +02:00
test_auth_fail(Config0) ->
Add tests for external component
2016-09-21 09:45:11 +02:00
Config = set_opt(user, <<"wrong">>,
set_opt(password, <<"wrong">>, Config0)),
Add more tests for C2S
2016-09-20 13:04:07 +02:00
disconnect(auth(Config, _ShouldFail = true)).
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
test_bind(Config) ->
disconnect(bind(Config)).
test_open_session(Config) ->
Add more tests for C2S
2016-09-20 13:04:07 +02:00
disconnect(open_session(Config, true)).
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
roster_get(Config) ->
Make common tests working again
2016-09-13 11:30:05 +02:00
#iq{type = result, sub_els = [#roster_query{items = []}]} =
send_recv(Config, #iq{type = get, sub_els = [#roster_query{}]}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
disconnect(Config).
Fix roster version support
2013-09-24 10:40:32 +02:00
roster_ver(Config) ->
%% Get initial "ver"
Make common tests working again
2016-09-13 11:30:05 +02:00
#iq{type = result, sub_els = [#roster_query{ver = Ver1, items = []}]} =
Fix roster version support
2013-09-24 10:40:32 +02:00
send_recv(Config, #iq{type = get,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#roster_query{ver = <<"">>}]}),
Fix roster version support
2013-09-24 10:40:32 +02:00
%% Should receive empty IQ-result
#iq{type = result, sub_els = []} =
send_recv(Config, #iq{type = get,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#roster_query{ver = Ver1}]}),
Fix roster version support
2013-09-24 10:40:32 +02:00
%% Attempting to subscribe to server's JID
send(Config, #presence{type = subscribe, to = server_jid(Config)}),
%% Receive a single roster push with the new "ver"
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
#iq{type = set, sub_els = [#roster_query{ver = Ver2}]} = recv(Config),
Fix roster version support
2013-09-24 10:40:32 +02:00
%% Requesting roster with the previous "ver". Should receive Ver2 again
Make common tests working again
2016-09-13 11:30:05 +02:00
#iq{type = result, sub_els = [#roster_query{ver = Ver2}]} =
Fix roster version support
2013-09-24 10:40:32 +02:00
send_recv(Config, #iq{type = get,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#roster_query{ver = Ver1}]}),
Fix roster version support
2013-09-24 10:40:32 +02:00
%% Now requesting roster with the newest "ver". Should receive empty IQ.
#iq{type = result, sub_els = []} =
send_recv(Config, #iq{type = get,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#roster_query{ver = Ver2}]}),
Fix roster version support
2013-09-24 10:40:32 +02:00
disconnect(Config).
Add more tests for C2S
2016-09-20 13:04:07 +02:00
codec_failure(Config) ->
Add tests for external component
2016-09-21 09:45:11 +02:00
JID = my_jid(Config),
#iq{type = error} =
send_recv(Config, #iq{type = wrong, from = JID, to = JID}),
Add more tests for C2S
2016-09-20 13:04:07 +02:00
disconnect(Config).
unsupported_query(Config) ->
ServerJID = server_jid(Config),
#iq{type = error} = send_recv(Config, #iq{type = get, to = ServerJID}),
#iq{type = error} = send_recv(Config, #iq{type = get, to = ServerJID,
sub_els = [#caps{}]}),
#iq{type = error} = send_recv(Config, #iq{type = get, to = ServerJID,
sub_els = [#roster_query{},
#disco_info{},
#privacy_query{}]}),
disconnect(Config).
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
presence(Config) ->
send(Config, #presence{}),
JID = my_jid(Config),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{from = JID, to = JID}),
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
disconnect(Config).
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
presence_broadcast(Config) ->
Add mod_caps checks to the testing suite
2014-07-15 09:53:40 +02:00
Feature = <<"p1:tmp:", (randoms:get_string())/binary>>,
Update crypto calls
2015-07-30 17:47:15 +02:00
Ver = crypto:hash(sha, ["client", $/, "bot", $/, "en", $/,
"ejabberd_ct", $<, Feature, $<]),
Add mod_caps checks to the testing suite
2014-07-15 09:53:40 +02:00
B64Ver = base64:encode(Ver),
Node = <<(?EJABBERD_CT_URI)/binary, $#, B64Ver/binary>>,
Server = ?config(server, Config),
ServerJID = server_jid(Config),
Info = #disco_info{identities =
[#identity{category = <<"client">>,
type = <<"bot">>,
lang = <<"en">>,
name = <<"ejabberd_ct">>}],
node = Node, features = [Feature]},
Make common tests working again
2016-09-13 11:30:05 +02:00
Caps = #caps{hash = <<"sha-1">>, node = ?EJABBERD_CT_URI, version = B64Ver},
Add mod_caps checks to the testing suite
2014-07-15 09:53:40 +02:00
send(Config, #presence{sub_els = [Caps]}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
JID = my_jid(Config),
Add mod_caps checks to the testing suite
2014-07-15 09:53:40 +02:00
%% We receive:
%% 1) disco#info iq request for CAPS
%% 2) welcome message
%% 3) presence broadcast
{IQ, _, _} = ?recv3(#iq{type = get,
from = ServerJID,
sub_els = [#disco_info{node = Node}]},
#message{type = normal},
#presence{from = JID, to = JID}),
send(Config, #iq{type = result, id = IQ#iq.id,
to = ServerJID, sub_els = [Info]}),
%% We're trying to read our feature from ejabberd database
%% with exponential back-off as our IQ response may be delayed.
[Feature] =
lists:foldl(
fun(Time, []) ->
timer:sleep(Time),
Make common tests working again
2016-09-13 11:30:05 +02:00
mod_caps:get_features(Server, Caps);
Add mod_caps checks to the testing suite
2014-07-15 09:53:40 +02:00
(_, Acc) ->
Acc
end, [], [0, 100, 200, 2000, 5000, 10000]),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
disconnect(Config).
ping(Config) ->
true = is_feature_advertised(Config, ?NS_PING),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = []} =
send_recv(
Config,
#iq{type = get, sub_els = [#ping{}], to = server_jid(Config)}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
disconnect(Config).
version(Config) ->
true = is_feature_advertised(Config, ?NS_VERSION),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = [#version{}]} =
send_recv(
Config, #iq{type = get, sub_els = [#version{}],
to = server_jid(Config)}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
disconnect(Config).
time(Config) ->
true = is_feature_advertised(Config, ?NS_TIME),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = [#time{}]} =
send_recv(Config, #iq{type = get, sub_els = [#time{}],
to = server_jid(Config)}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
disconnect(Config).
disco(Config) ->
true = is_feature_advertised(Config, ?NS_DISCO_INFO),
true = is_feature_advertised(Config, ?NS_DISCO_ITEMS),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = [#disco_items{items = Items}]} =
send_recv(
Config, #iq{type = get, sub_els = [#disco_items{}],
to = server_jid(Config)}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
lists:foreach(
fun(#disco_item{jid = JID, node = Node}) ->
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result} =
send_recv(Config,
#iq{type = get, to = JID,
sub_els = [#disco_info{node = Node}]})
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
end, Items),
disconnect(Config).
Add more tests for C2S
2016-09-20 13:04:07 +02:00
replaced_master(Config0) ->
Config = bind(Config0),
wait_for_slave(Config),
?recv1(#stream_error{reason = conflict}),
?recv1({xmlstreamend, <<"stream:stream">>}),
close_socket(Config).
replaced_slave(Config0) ->
wait_for_master(Config0),
Config = bind(Config0),
disconnect(Config).
Add tests for session management
2014-07-22 11:59:31 +02:00
sm(Config) ->
Server = ?config(server, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
ServerJID = jid:make(<<"">>, Server, <<"">>),
Avoid error bounces when testing stream management The test suite sends messages to the server JID while checking whether the stream management code counts outgoing stanzas correctly. We now set type='headline' for those messages to avoid error bounces.
2016-05-06 16:37:17 +02:00
%% Send messages of type 'headline' so the server discards them silently
Msg = #message{to = ServerJID, type = headline,
body = [#text{data = <<"body">>}]},
Add tests for session management
2014-07-22 11:59:31 +02:00
true = ?config(sm, Config),
%% Enable the session management with resumption enabled
Recompile the xmpp_codec using updated XML generator
2014-08-26 20:21:27 +02:00
send(Config, #sm_enable{resume = true, xmlns = ?NS_STREAM_MGMT_3}),
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
#sm_enabled{id = ID, resume = true} = recv(Config),
Add tests for session management
2014-07-22 11:59:31 +02:00
%% Initial request; 'h' should be 0.
Recompile the xmpp_codec using updated XML generator
2014-08-26 20:21:27 +02:00
send(Config, #sm_r{xmlns = ?NS_STREAM_MGMT_3}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#sm_a{h = 0}),
Add tests for session management
2014-07-22 11:59:31 +02:00
%% sending two messages and requesting again; 'h' should be 3.
send(Config, Msg),
send(Config, Msg),
send(Config, Msg),
Recompile the xmpp_codec using updated XML generator
2014-08-26 20:21:27 +02:00
send(Config, #sm_r{xmlns = ?NS_STREAM_MGMT_3}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#sm_a{h = 3}),
Add tests for session management
2014-07-22 11:59:31 +02:00
close_socket(Config),
{save_config, set_opt(sm_previd, ID, Config)}.
sm_resume(Config) ->
{sm, SMConfig} = ?config(saved_config, Config),
ID = ?config(sm_previd, SMConfig),
Server = ?config(server, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
ServerJID = jid:make(<<"">>, Server, <<"">>),
Add tests for session management
2014-07-22 11:59:31 +02:00
MyJID = my_jid(Config),
Txt = #text{data = <<"body">>},
Msg = #message{from = ServerJID, to = MyJID, body = [Txt]},
%% Route message. The message should be queued by the C2S process.
Improve namespace handling
2016-09-24 13:17:21 +02:00
ejabberd_router:route(ServerJID, MyJID, Msg),
Recompile the xmpp_codec using updated XML generator
2014-08-26 20:21:27 +02:00
send(Config, #sm_resume{previd = ID, h = 0, xmlns = ?NS_STREAM_MGMT_3}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#sm_resumed{previd = ID, h = 3}),
?recv1(#message{from = ServerJID, to = MyJID, body = [Txt]}),
?recv1(#sm_r{}),
Recompile the xmpp_codec using updated XML generator
2014-08-26 20:21:27 +02:00
send(Config, #sm_a{h = 1, xmlns = ?NS_STREAM_MGMT_3}),
XEP-0198: Add 'h' attribute to <failed/> element If a resume request is rejected because the session timed out, indicate the number of handled stanzas as per version 1.5 of XEP-0198.
2016-05-24 22:20:58 +02:00
%% Send another stanza to increment the server's 'h' for sm_resume_failed.
send(Config, #presence{to = ServerJID}),
close_socket(Config),
{save_config, set_opt(sm_previd, ID, Config)}.
sm_resume_failed(Config) ->
{sm_resume, SMConfig} = ?config(saved_config, Config),
ID = ?config(sm_previd, SMConfig),
ct:sleep(5000), % Wait for session to time out.
send(Config, #sm_resume{previd = ID, h = 1, xmlns = ?NS_STREAM_MGMT_3}),
?recv1(#sm_failed{reason = 'item-not-found', h = 4}),
Add tests for session management
2014-07-22 11:59:31 +02:00
disconnect(Config).
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
private(Config) ->
Conference = #bookmark_conference{name = <<"Some name">>,
autojoin = true,
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
jid = jid:make(
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
<<"some">>,
<<"some.conference.org">>,
<<>>)},
Storage = #bookmark_storage{conference = [Conference]},
Improve namespace handling
2016-09-24 13:17:21 +02:00
StorageXMLOut = xmpp:encode(Storage),
Add tests for external component
2016-09-21 09:45:11 +02:00
WrongEl = #xmlel{name = <<"wrong">>},
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = error} =
Add tests for external component
2016-09-21 09:45:11 +02:00
send_recv(Config, #iq{type = get,
sub_els = [#private{xml_els = [WrongEl]}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = []} =
send_recv(
Config, #iq{type = set,
Add tests for external component
2016-09-21 09:45:11 +02:00
sub_els = [#private{xml_els = [WrongEl, StorageXMLOut]}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result,
Improve the XMPP codec, fix the test suite accordingly
2013-07-03 15:33:19 +02:00
sub_els = [#private{xml_els = [StorageXMLIn]}]} =
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
send_recv(
Config,
#iq{type = get,
Improve namespace handling
2016-09-24 13:17:21 +02:00
sub_els = [#private{xml_els = [xmpp:encode(
Improve the XMPP codec, fix the test suite accordingly
2013-07-03 15:33:19 +02:00
#bookmark_storage{})]}]}),
Improve namespace handling
2016-09-24 13:17:21 +02:00
Storage = xmpp:decode(StorageXMLIn),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
disconnect(Config).
last(Config) ->
true = is_feature_advertised(Config, ?NS_LAST),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = [#last{}]} =
send_recv(Config, #iq{type = get, sub_els = [#last{}],
to = server_jid(Config)}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
disconnect(Config).
privacy(Config) ->
Advertise privacy lists support via disco#info
2013-06-14 20:17:38 +02:00
true = is_feature_advertised(Config, ?NS_PRIVACY),
Make common tests working again
2016-09-13 11:30:05 +02:00
#iq{type = result, sub_els = [#privacy_query{}]} =
send_recv(Config, #iq{type = get, sub_els = [#privacy_query{}]}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
JID = <<"tybalt@example.com">>,
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
I1 = send(Config,
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#privacy_query{
Convert XMPP codec specification to the new format
2013-06-13 18:34:45 +02:00
lists = [#privacy_list{
name = <<"public">>,
items =
[#privacy_item{
type = jid,
order = 3,
action = deny,
Make common tests working again
2016-09-13 11:30:05 +02:00
presence_in = true,
Convert XMPP codec specification to the new format
2013-06-13 18:34:45 +02:00
value = JID}]}]}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
{Push1, _} =
?recv2(
#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#privacy_query{
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
lists = [#privacy_list{
name = <<"public">>}]}]},
#iq{type = result, id = I1, sub_els = []}),
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, make_iq_result(Push1)),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = []} =
send_recv(Config, #iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#privacy_query{active = <<"public">>}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = []} =
send_recv(Config, #iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#privacy_query{default = <<"public">>}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#privacy_query{default = <<"public">>,
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
active = <<"public">>,
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
lists = [#privacy_list{name = <<"public">>}]}]} =
Make common tests working again
2016-09-13 11:30:05 +02:00
send_recv(Config, #iq{type = get, sub_els = [#privacy_query{}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = []} =
send_recv(Config,
Make common tests working again
2016-09-13 11:30:05 +02:00
#iq{type = set, sub_els = [#privacy_query{default = none}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = []} =
Make common tests working again
2016-09-13 11:30:05 +02:00
send_recv(Config, #iq{type = set, sub_els = [#privacy_query{active = none}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
I2 = send(Config, #iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#privacy_query{
Convert XMPP codec specification to the new format
2013-06-13 18:34:45 +02:00
lists =
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
[#privacy_list{
name = <<"public">>}]}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
{Push2, _} =
?recv2(
#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#privacy_query{
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
lists = [#privacy_list{
name = <<"public">>}]}]},
#iq{type = result, id = I2, sub_els = []}),
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, make_iq_result(Push2)),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
disconnect(Config).
blocking(Config) ->
true = is_feature_advertised(Config, ?NS_BLOCKING),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
JID = jid:make(<<"romeo">>, <<"montague.net">>, <<>>),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = [#block_list{}]} =
send_recv(Config, #iq{type = get, sub_els = [#block_list{}]}),
I1 = send(Config, #iq{type = set,
Convert XMPP codec specification to the new format
2013-06-13 18:34:45 +02:00
sub_els = [#block{items = [JID]}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
{Push1, Push2, _} =
?recv3(
#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#privacy_query{lists = [#privacy_list{}]}]},
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = set,
sub_els = [#block{items = [JID]}]},
#iq{type = result, id = I1, sub_els = []}),
send(Config, make_iq_result(Push1)),
send(Config, make_iq_result(Push2)),
I2 = send(Config, #iq{type = set,
Convert XMPP codec specification to the new format
2013-06-13 18:34:45 +02:00
sub_els = [#unblock{items = [JID]}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
{Push3, Push4, _} =
?recv3(
#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#privacy_query{lists = [#privacy_list{}]}]},
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = set,
sub_els = [#unblock{items = [JID]}]},
#iq{type = result, id = I2, sub_els = []}),
send(Config, make_iq_result(Push3)),
send(Config, make_iq_result(Push4)),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
disconnect(Config).
vcard(Config) ->
true = is_feature_advertised(Config, ?NS_VCARD),
VCard =
Make common tests working again
2016-09-13 11:30:05 +02:00
#vcard_temp{fn = <<"Peter Saint-Andre">>,
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
n = #vcard_name{family = <<"Saint-Andre">>,
given = <<"Peter">>},
nickname = <<"stpeter">>,
bday = <<"1966-08-06">>,
adr = [#vcard_adr{work = true,
extadd = <<"Suite 600">>,
street = <<"1899 Wynkoop Street">>,
locality = <<"Denver">>,
region = <<"CO">>,
pcode = <<"80202">>,
ctry = <<"USA">>},
#vcard_adr{home = true,
locality = <<"Denver">>,
region = <<"CO">>,
pcode = <<"80209">>,
ctry = <<"USA">>}],
tel = [#vcard_tel{work = true,voice = true,
number = <<"303-308-3282">>},
#vcard_tel{home = true,voice = true,
number = <<"303-555-1212">>}],
email = [#vcard_email{internet = true,pref = true,
userid = <<"stpeter@jabber.org">>}],
jabberid = <<"stpeter@jabber.org">>,
title = <<"Executive Director">>,role = <<"Patron Saint">>,
org = #vcard_org{name = <<"XMPP Standards Foundation">>},
url = <<"http://www.xmpp.org/xsf/people/stpeter.shtml">>,
desc = <<"More information about me is located on my "
"personal website: http://www.saint-andre.com/">>},
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = []} =
send_recv(Config, #iq{type = set, sub_els = [VCard]}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
%% TODO: check if VCard == VCard1.
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = [_VCard1]} =
Make common tests working again
2016-09-13 11:30:05 +02:00
send_recv(Config, #iq{type = get, sub_els = [#vcard_temp{}]}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
disconnect(Config).
Add LDAP test cases
2013-06-21 19:23:56 +02:00
vcard_get(Config) ->
true = is_feature_advertised(Config, ?NS_VCARD),
%% TODO: check if VCard corresponds to LDIF data from ejabberd.ldif
#iq{type = result, sub_els = [_VCard]} =
Make common tests working again
2016-09-13 11:30:05 +02:00
send_recv(Config, #iq{type = get, sub_els = [#vcard_temp{}]}),
Add LDAP test cases
2013-06-21 19:23:56 +02:00
disconnect(Config).
Proper naming for LDAP test function for shared roster
2016-03-25 17:42:58 +01:00
ldap_shared_roster_get(Config) ->
Add test to demonstrate issue to retrieve roster with mod_shared_roster_ldap
2016-03-25 17:30:12 +01:00
Item = #roster_item{jid = jid:from_string(<<"user2@ldap.localhost">>), name = <<"Test User 2">>,
groups = [<<"group1">>], subscription = both},
Make common tests working again
2016-09-13 11:30:05 +02:00
#iq{type = result, sub_els = [#roster_query{items = [Item]}]} =
send_recv(Config, #iq{type = get, sub_els = [#roster_query{}]}),
Add test to demonstrate issue to retrieve roster with mod_shared_roster_ldap
2016-03-25 17:30:12 +01:00
disconnect(Config).
Add tests for mod_vcard_xupdate
2014-10-30 21:54:02 +01:00
vcard_xupdate_master(Config) ->
Img = <<137, "PNG\r\n", 26, $\n>>,
ImgHash = p1_sha:sha(Img),
MyJID = my_jid(Config),
Peer = ?config(slave, Config),
wait_for_slave(Config),
send(Config, #presence{}),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv2(#presence{from = MyJID, type = available},
#presence{from = Peer, type = available}),
VCard = #vcard_temp{photo = #vcard_photo{type = <<"image/png">>, binval = Img}},
Add tests for mod_vcard_xupdate
2014-10-30 21:54:02 +01:00
I1 = send(Config, #iq{type = set, sub_els = [VCard]}),
?recv2(#iq{type = result, sub_els = [], id = I1},
Make common tests working again
2016-09-13 11:30:05 +02:00
#presence{from = MyJID, type = available,
sub_els = [#vcard_xupdate{hash = ImgHash}]}),
I2 = send(Config, #iq{type = set, sub_els = [#vcard_temp{}]}),
Add tests for mod_vcard_xupdate
2014-10-30 21:54:02 +01:00
?recv3(#iq{type = result, sub_els = [], id = I2},
Make common tests working again
2016-09-13 11:30:05 +02:00
#presence{from = MyJID, type = available,
sub_els = [#vcard_xupdate{hash = undefined}]},
Add tests for mod_vcard_xupdate
2014-10-30 21:54:02 +01:00
#presence{from = Peer, type = unavailable}),
disconnect(Config).
vcard_xupdate_slave(Config) ->
Img = <<137, "PNG\r\n", 26, $\n>>,
ImgHash = p1_sha:sha(Img),
MyJID = my_jid(Config),
Peer = ?config(master, Config),
send(Config, #presence{}),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#presence{from = MyJID, type = available}),
Add tests for mod_vcard_xupdate
2014-10-30 21:54:02 +01:00
wait_for_master(Config),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#presence{from = Peer, type = available}),
?recv1(#presence{from = Peer, type = available,
sub_els = [#vcard_xupdate{hash = ImgHash}]}),
?recv1(#presence{from = Peer, type = available,
sub_els = [#vcard_xupdate{hash = undefined}]}),
Add tests for mod_vcard_xupdate
2014-10-30 21:54:02 +01:00
disconnect(Config).
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
stats(Config) ->
Make common tests working again
2016-09-13 11:30:05 +02:00
#iq{type = result, sub_els = [#stats{list = Stats}]} =
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
send_recv(Config, #iq{type = get, sub_els = [#stats{}],
to = server_jid(Config)}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
lists:foreach(
Add roster checks
2013-06-15 15:28:14 +02:00
fun(#stat{} = Stat) ->
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = [_|_]} =
send_recv(Config, #iq{type = get,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#stats{list = [Stat]}],
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
to = server_jid(Config)})
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
end, Stats),
disconnect(Config).
pubsub(Config) ->
Do not fetch disco#info multiple times
2013-06-25 19:32:08 +02:00
Features = get_features(Config, pubsub_jid(Config)),
true = lists:member(?NS_PUBSUB, Features),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
%% Publish <presence/> element within node "presence"
ItemID = randoms:get_string(),
Stronger tests in the test suite, SQL updates and fixes
2016-05-24 17:44:07 +02:00
Node = <<"presence!@#$%^&*()'\"`~<>+-/;:_=[]{}|\\">>,
Make common tests working again
2016-09-13 11:30:05 +02:00
Item = #ps_item{id = ItemID,
Improve namespace handling
2016-09-24 13:17:21 +02:00
xml_els = [xmpp:encode(#presence{})]},
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#pubsub{publish = #ps_publish{
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
node = Node,
Make common tests working again
2016-09-13 11:30:05 +02:00
items = [#ps_item{id = ItemID}]}}]} =
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
send_recv(Config,
#iq{type = set, to = pubsub_jid(Config),
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#pubsub{publish = #ps_publish{
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
node = Node,
items = [Item]}}]}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
%% Subscribe to node "presence"
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
I1 = send(Config,
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = set, to = pubsub_jid(Config),
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#pubsub{subscribe = #ps_subscribe{
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
node = Node,
jid = my_jid(Config)}}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
?recv2(
Make common tests working again
2016-09-13 11:30:05 +02:00
#message{sub_els = [#ps_event{}, #delay{}]},
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
#iq{type = result, id = I1}),
Convert XMPP codec specification to the new format
2013-06-13 18:34:45 +02:00
%% Get subscriptions
Do not fetch disco#info multiple times
2013-06-25 19:32:08 +02:00
true = lists:member(?PUBSUB("retrieve-subscriptions"), Features),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result,
Convert XMPP codec specification to the new format
2013-06-13 18:34:45 +02:00
sub_els =
[#pubsub{subscriptions =
Make common tests working again
2016-09-13 11:30:05 +02:00
{<<>>, [#ps_subscription{node = Node}]}}]} =
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
send_recv(Config, #iq{type = get, to = pubsub_jid(Config),
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#pubsub{subscriptions = {<<>>, []}}]}),
Convert XMPP codec specification to the new format
2013-06-13 18:34:45 +02:00
%% Get affiliations
Do not fetch disco#info multiple times
2013-06-25 19:32:08 +02:00
true = lists:member(?PUBSUB("retrieve-affiliations"), Features),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result,
Convert XMPP codec specification to the new format
2013-06-13 18:34:45 +02:00
sub_els = [#pubsub{
affiliations =
Make common tests working again
2016-09-13 11:30:05 +02:00
{<<>>, [#ps_affiliation{node = Node, type = owner}]}}]} =
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
send_recv(Config, #iq{type = get, to = pubsub_jid(Config),
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#pubsub{affiliations = {<<>>, []}}]}),
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
%% Fetching published items from node "presence"
#iq{type = result,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#pubsub{items = #ps_items{
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
node = Node,
items = [Item]}}]} =
send_recv(Config,
#iq{type = get, to = pubsub_jid(Config),
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#pubsub{items = #ps_items{node = Node}}]}),
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
%% Deleting the item from the node
Do not fetch disco#info multiple times
2013-06-25 19:32:08 +02:00
true = lists:member(?PUBSUB("delete-items"), Features),
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
I2 = send(Config,
#iq{type = set, to = pubsub_jid(Config),
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#pubsub{retract = #ps_retract{
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
node = Node,
Make common tests working again
2016-09-13 11:30:05 +02:00
items = [#ps_item{id = ItemID}]}}]}),
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
?recv2(
#iq{type = result, id = I2, sub_els = []},
Make common tests working again
2016-09-13 11:30:05 +02:00
#message{sub_els = [#ps_event{
items = #ps_items{
node = Node,
retract = ItemID}}]}),
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
%% Unsubscribe from node "presence"
#iq{type = result, sub_els = []} =
send_recv(Config,
#iq{type = set, to = pubsub_jid(Config),
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#pubsub{unsubscribe = #ps_unsubscribe{
Add more pubsub test cases
2013-06-25 19:00:27 +02:00
node = Node,
jid = my_jid(Config)}}]}),
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
disconnect(Config).
Add tests for MIX
2016-03-10 15:42:37 +01:00
mix_master(Config) ->
MIX = mix_jid(Config),
Room = mix_room_jid(Config),
MyJID = my_jid(Config),
MyBareJID = jid:remove_resource(MyJID),
true = is_feature_advertised(Config, ?NS_MIX_0, MIX),
#iq{type = result,
sub_els =
[#disco_info{
identities = [#identity{category = <<"conference">>,
type = <<"text">>}],
xdata = [#xdata{type = result, fields = XFields}]}]} =
send_recv(Config, #iq{type = get, to = MIX, sub_els = [#disco_info{}]}),
true = lists:any(
fun(#xdata_field{var = <<"FORM_TYPE">>,
values = [?NS_MIX_SERVICEINFO_0]}) -> true;
(_) -> false
end, XFields),
%% Joining
Nodes = [?NS_MIX_NODES_MESSAGES, ?NS_MIX_NODES_PRESENCE,
?NS_MIX_NODES_PARTICIPANTS, ?NS_MIX_NODES_SUBJECT,
?NS_MIX_NODES_CONFIG],
I0 = send(Config, #iq{type = set, to = Room,
sub_els = [#mix_join{subscribe = Nodes}]}),
{_, #message{sub_els =
Make common tests working again
2016-09-13 11:30:05 +02:00
[#ps_event{
items = #ps_items{
node = ?NS_MIX_NODES_PARTICIPANTS,
items = [#ps_item{
id = ParticipantID,
xml_els = [PXML]}]}}]}} =
Add tests for MIX
2016-03-10 15:42:37 +01:00
?recv2(#iq{type = result, id = I0,
sub_els = [#mix_join{subscribe = Nodes, jid = MyBareJID}]},
#message{from = Room}),
Improve namespace handling
2016-09-24 13:17:21 +02:00
#mix_participant{jid = MyBareJID} = xmpp:decode(PXML),
Add tests for MIX
2016-03-10 15:42:37 +01:00
%% Coming online
PresenceID = randoms:get_string(),
Improve namespace handling
2016-09-24 13:17:21 +02:00
Presence = xmpp:encode(#presence{}),
Add tests for MIX
2016-03-10 15:42:37 +01:00
I1 = send(
Config,
#iq{type = set, to = Room,
sub_els =
[#pubsub{
Make common tests working again
2016-09-13 11:30:05 +02:00
publish = #ps_publish{
Add tests for MIX
2016-03-10 15:42:37 +01:00
node = ?NS_MIX_NODES_PRESENCE,
Make common tests working again
2016-09-13 11:30:05 +02:00
items = [#ps_item{
Add tests for MIX
2016-03-10 15:42:37 +01:00
id = PresenceID,
xml_els = [Presence]}]}}]}),
?recv2(#iq{type = result, id = I1,
sub_els =
[#pubsub{
Make common tests working again
2016-09-13 11:30:05 +02:00
publish = #ps_publish{
Add tests for MIX
2016-03-10 15:42:37 +01:00
node = ?NS_MIX_NODES_PRESENCE,
Make common tests working again
2016-09-13 11:30:05 +02:00
items = [#ps_item{id = PresenceID}]}}]},
Add tests for MIX
2016-03-10 15:42:37 +01:00
#message{from = Room,
sub_els =
Make common tests working again
2016-09-13 11:30:05 +02:00
[#ps_event{
items = #ps_items{
node = ?NS_MIX_NODES_PRESENCE,
items = [#ps_item{
Add tests for MIX
2016-03-10 15:42:37 +01:00
id = PresenceID,
Make common tests working again
2016-09-13 11:30:05 +02:00
xml_els = [Presence]}]}}]}),
Add tests for MIX
2016-03-10 15:42:37 +01:00
%% Coming offline
send(Config, #presence{type = unavailable, to = Room}),
%% Receiving presence retract event
#message{from = Room,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#ps_event{
items = #ps_items{
node = ?NS_MIX_NODES_PRESENCE,
Improve namespace handling
2016-09-24 13:17:21 +02:00
retract = PresenceID}}]} = recv(Config),
Add tests for MIX
2016-03-10 15:42:37 +01:00
%% Leaving
I2 = send(Config, #iq{type = set, to = Room, sub_els = [#mix_leave{}]}),
?recv2(#iq{type = result, id = I2, sub_els = []},
#message{from = Room,
sub_els =
Make common tests working again
2016-09-13 11:30:05 +02:00
[#ps_event{
items = #ps_items{
node = ?NS_MIX_NODES_PARTICIPANTS,
retract = ParticipantID}}]}),
Add tests for MIX
2016-03-10 15:42:37 +01:00
disconnect(Config).
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
mix_slave(Config) ->
Add tests for MIX
2016-03-10 15:42:37 +01:00
disconnect(Config).
Allow running test groups independently We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia
2016-03-24 10:02:13 +01:00
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
roster_subscribe_master(Config) ->
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, #presence{}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{}),
Add roster checks
2013-06-15 15:28:14 +02:00
wait_for_slave(Config),
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
Peer = ?config(slave, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
LPeer = jid:remove_resource(Peer),
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, #presence{type = subscribe, to = LPeer}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
Push1 = ?recv1(#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#roster_query{items = [#roster_item{
Add roster checks
2013-06-15 15:28:14 +02:00
ask = subscribe,
subscription = none,
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
jid = LPeer}]}]}),
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, make_iq_result(Push1)),
{Push2, _} = ?recv2(
#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#roster_query{items = [#roster_item{
Add roster checks
2013-06-15 15:28:14 +02:00
subscription = to,
jid = LPeer}]}]},
#presence{type = subscribed, from = LPeer}),
send(Config, make_iq_result(Push2)),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#presence{type = available, from = Peer}),
Add roster checks
2013-06-15 15:28:14 +02:00
%% BUG: ejabberd sends previous push again. Is it ok?
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
Push3 = ?recv1(#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#roster_query{items = [#roster_item{
Add roster checks
2013-06-15 15:28:14 +02:00
subscription = to,
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
jid = LPeer}]}]}),
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, make_iq_result(Push3)),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{type = subscribe, from = LPeer}),
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, #presence{type = subscribed, to = LPeer}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
Push4 = ?recv1(#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#roster_query{items = [#roster_item{
Add roster checks
2013-06-15 15:28:14 +02:00
subscription = both,
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
jid = LPeer}]}]}),
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, make_iq_result(Push4)),
%% Move into a group
Groups = [<<"A">>, <<"B">>],
Item = #roster_item{jid = LPeer, groups = Groups},
Make common tests working again
2016-09-13 11:30:05 +02:00
I1 = send(Config, #iq{type = set, sub_els = [#roster_query{items = [Item]}]}),
Add roster checks
2013-06-15 15:28:14 +02:00
{Push5, _} = ?recv2(
#iq{type = set,
sub_els =
Make common tests working again
2016-09-13 11:30:05 +02:00
[#roster_query{items = [#roster_item{
Add roster checks
2013-06-15 15:28:14 +02:00
jid = LPeer,
subscription = both}]}]},
#iq{type = result, id = I1, sub_els = []}),
send(Config, make_iq_result(Push5)),
Make common tests working again
2016-09-13 11:30:05 +02:00
#iq{sub_els = [#roster_query{items = [#roster_item{groups = G1}]}]} = Push5,
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
Groups = lists:sort(G1),
Add roster checks
2013-06-15 15:28:14 +02:00
wait_for_slave(Config),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{type = unavailable, from = Peer}),
Add roster checks
2013-06-15 15:28:14 +02:00
disconnect(Config).
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
roster_subscribe_slave(Config) ->
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, #presence{}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{}),
Add roster checks
2013-06-15 15:28:14 +02:00
wait_for_master(Config),
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
Peer = ?config(master, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
LPeer = jid:remove_resource(Peer),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{type = subscribe, from = LPeer}),
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, #presence{type = subscribed, to = LPeer}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
Push1 = ?recv1(#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#roster_query{items = [#roster_item{
Add roster checks
2013-06-15 15:28:14 +02:00
subscription = from,
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
jid = LPeer}]}]}),
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, make_iq_result(Push1)),
send(Config, #presence{type = subscribe, to = LPeer}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
Push2 = ?recv1(#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#roster_query{items = [#roster_item{
Add roster checks
2013-06-15 15:28:14 +02:00
ask = subscribe,
subscription = from,
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
jid = LPeer}]}]}),
Add roster checks
2013-06-15 15:28:14 +02:00
send(Config, make_iq_result(Push2)),
{Push3, _} = ?recv2(
#iq{type = set,
Make common tests working again
2016-09-13 11:30:05 +02:00
sub_els = [#roster_query{items = [#roster_item{
Add roster checks
2013-06-15 15:28:14 +02:00
subscription = both,
jid = LPeer}]}]},
#presence{type = subscribed, from = LPeer}),
send(Config, make_iq_result(Push3)),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#presence{type = available, from = Peer}),
Add roster checks
2013-06-15 15:28:14 +02:00
wait_for_master(Config),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
disconnect(Config).
roster_remove_master(Config) ->
MyJID = my_jid(Config),
Peer = ?config(slave, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
LPeer = jid:remove_resource(Peer),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
Groups = [<<"A">>, <<"B">>],
wait_for_slave(Config),
send(Config, #presence{}),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv2(#presence{from = MyJID, type = available},
#presence{from = Peer, type = available}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
%% The peer removed us from its roster.
{Push1, Push2, _, _, _} =
?recv5(
%% TODO: I guess this can be optimized, we don't need
%% to send transient roster push with subscription = 'to'.
#iq{type = set,
sub_els =
Make common tests working again
2016-09-13 11:30:05 +02:00
[#roster_query{items = [#roster_item{
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
jid = LPeer,
subscription = to}]}]},
#iq{type = set,
sub_els =
Make common tests working again
2016-09-13 11:30:05 +02:00
[#roster_query{items = [#roster_item{
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
jid = LPeer,
subscription = none}]}]},
#presence{type = unsubscribe, from = LPeer},
#presence{type = unsubscribed, from = LPeer},
#presence{type = unavailable, from = Peer}),
send(Config, make_iq_result(Push1)),
send(Config, make_iq_result(Push2)),
Make common tests working again
2016-09-13 11:30:05 +02:00
#iq{sub_els = [#roster_query{items = [#roster_item{groups = G1}]}]} = Push1,
#iq{sub_els = [#roster_query{items = [#roster_item{groups = G2}]}]} = Push2,
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
Groups = lists:sort(G1), Groups = lists:sort(G2),
disconnect(Config).
roster_remove_slave(Config) ->
MyJID = my_jid(Config),
Peer = ?config(master, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
LPeer = jid:remove_resource(Peer),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
send(Config, #presence{}),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#presence{from = MyJID, type = available}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
wait_for_master(Config),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#presence{from = Peer, type = available}),
Add roster checks
2013-06-15 15:28:14 +02:00
%% Remove the peer from roster.
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
Item = #roster_item{jid = LPeer, subscription = remove},
Make common tests working again
2016-09-13 11:30:05 +02:00
I = send(Config, #iq{type = set, sub_els = [#roster_query{items = [Item]}]}),
Better handle incoming packets sequence
2013-06-18 14:31:19 +02:00
{Push, _, _} = ?recv3(
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = set,
sub_els =
Make common tests working again
2016-09-13 11:30:05 +02:00
[#roster_query{items = [#roster_item{
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
jid = LPeer,
subscription = remove}]}]},
Better handle incoming packets sequence
2013-06-18 14:31:19 +02:00
#iq{type = result, id = I, sub_els = []},
#presence{type = unavailable, from = Peer}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
send(Config, make_iq_result(Push)),
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
disconnect(Config).
proxy65_master(Config) ->
Proxy = proxy_jid(Config),
MyJID = my_jid(Config),
Peer = ?config(slave, Config),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
wait_for_slave(Config),
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
send(Config, #presence{}),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#presence{from = MyJID, type = available}),
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
true = is_feature_advertised(Config, ?NS_BYTESTREAMS, Proxy),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
#iq{type = result, sub_els = [#bytestreams{hosts = [StreamHost]}]} =
send_recv(
Config,
#iq{type = get, sub_els = [#bytestreams{}], to = Proxy}),
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
SID = randoms:get_string(),
Data = crypto:rand_bytes(1024),
put_event(Config, {StreamHost, SID, Data}),
Socks5 = socks5_connect(StreamHost, {SID, MyJID, Peer}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
wait_for_slave(Config),
#iq{type = result, sub_els = []} =
send_recv(Config,
#iq{type = set, to = Proxy,
sub_els = [#bytestreams{activate = Peer, sid = SID}]}),
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
socks5_send(Socks5, Data),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
%%?recv1(#presence{type = unavailable, from = Peer}),
Add roster checks
2013-06-15 15:28:14 +02:00
disconnect(Config).
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
proxy65_slave(Config) ->
MyJID = my_jid(Config),
Peer = ?config(master, Config),
send(Config, #presence{}),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#presence{from = MyJID, type = available}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
wait_for_master(Config),
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
{StreamHost, SID, Data} = get_event(Config),
Socks5 = socks5_connect(StreamHost, {SID, Peer, MyJID}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
wait_for_master(Config),
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
socks5_recv(Socks5, Data),
disconnect(Config).
Add tests for MUC MAM
2016-05-01 11:48:23 +02:00
send_messages_to_room(Config, Range) ->
MyNick = ?config(master_nick, Config),
Room = muc_room_jid(Config),
MyNickJID = jid:replace_resource(Room, MyNick),
lists:foreach(
fun(N) ->
Text = #text{data = integer_to_binary(N)},
I = send(Config, #message{to = Room, body = [Text],
type = groupchat}),
?recv1(#message{from = MyNickJID, id = I,
type = groupchat,
body = [Text]})
end, Range).
retrieve_messages_from_room_via_mam(Config, Range) ->
MyNick = ?config(master_nick, Config),
Room = muc_room_jid(Config),
MyNickJID = jid:replace_resource(Room, MyNick),
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
MyJID = my_jid(Config),
Add tests for MUC MAM
2016-05-01 11:48:23 +02:00
QID = randoms:get_string(),
Make common tests working again
2016-09-13 11:30:05 +02:00
Count = length(Range),
Add tests for MUC MAM
2016-05-01 11:48:23 +02:00
I = send(Config, #iq{type = set, to = Room,
sub_els = [#mam_query{xmlns = ?NS_MAM_1, id = QID}]}),
lists:foreach(
fun(N) ->
Text = #text{data = integer_to_binary(N)},
?recv1(#message{
to = MyJID, from = Room,
sub_els =
[#mam_result{
xmlns = ?NS_MAM_1,
queryid = QID,
sub_els =
[#forwarded{
delay = #delay{},
sub_els = [#message{
from = MyNickJID,
type = groupchat,
body = [Text]}]}]}]})
end, Range),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#iq{from = Room, id = I, type = result,
sub_els = [#mam_fin{xmlns = ?NS_MAM_1,
id = QID,
rsm = #rsm_set{count = Count},
complete = true}]}).
Add tests for MUC MAM
2016-05-01 11:48:23 +02:00
muc_mam_master(Config) ->
MyNick = ?config(master_nick, Config),
Room = muc_room_jid(Config),
MyNickJID = jid:replace_resource(Room, MyNick),
%% Joining
send(Config, #presence{to = MyNickJID, sub_els = [#muc{}]}),
%% Receive self-presence
?recv1(#presence{from = MyNickJID}),
%% MAM feature should not be advertised at this point,
%% because MAM is not enabled so far
false = is_feature_advertised(Config, ?NS_MAM_1, Room),
%% Fill in some history
send_messages_to_room(Config, lists:seq(1, 21)),
%% We now should be able to retrieve those via MAM, even though
%% MAM is disabled. However, only last 20 messages should be received.
retrieve_messages_from_room_via_mam(Config, lists:seq(2, 21)),
%% Now enable MAM for the conference
%% Retrieve config first
#iq{type = result, sub_els = [#muc_owner{config = #xdata{} = RoomCfg}]} =
send_recv(Config, #iq{type = get, sub_els = [#muc_owner{}],
to = Room}),
%% Find the MAM field in the config and enable it
NewFields = lists:flatmap(
fun(#xdata_field{var = <<"muc#roomconfig_mam">> = Var}) ->
[#xdata_field{var = Var, values = [<<"1">>]}];
(_) ->
[]
end, RoomCfg#xdata.fields),
NewRoomCfg = #xdata{type = submit, fields = NewFields},
I1 = send(Config, #iq{type = set, to = Room,
sub_els = [#muc_owner{config = NewRoomCfg}]}),
?recv2(#iq{type = result, id = I1},
#message{from = Room, type = groupchat,
sub_els = [#muc_user{status_codes = [104]}]}),
%% Check if MAM has been enabled
true = is_feature_advertised(Config, ?NS_MAM_1, Room),
%% We now sending some messages again
send_messages_to_room(Config, lists:seq(1, 5)),
%% And retrieve them via MAM again.
retrieve_messages_from_room_via_mam(Config, lists:seq(1, 5)),
disconnect(Config).
muc_mam_slave(Config) ->
disconnect(Config).
Improve MUC test cases
2014-07-19 15:23:13 +02:00
muc_master(Config) ->
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
MyJID = my_jid(Config),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
PeerJID = ?config(slave, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
PeerBareJID = jid:remove_resource(PeerJID),
PeerJIDStr = jid:to_string(PeerJID),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
MUC = muc_jid(Config),
Room = muc_room_jid(Config),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
MyNick = ?config(master_nick, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
MyNickJID = jid:replace_resource(Room, MyNick),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
PeerNick = ?config(slave_nick, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
PeerNickJID = jid:replace_resource(Room, PeerNick),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
Subject = ?config(room_subject, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Localhost = jid:make(<<"">>, <<"localhost">>, <<"">>),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
true = is_feature_advertised(Config, ?NS_MUC, MUC),
%% Joining
Improve MUC test cases
2014-07-19 15:23:13 +02:00
send(Config, #presence{to = MyNickJID, sub_els = [#muc{}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
%% As per XEP-0045 we MUST receive stanzas in the following order:
%% 1. In-room presence from other occupants
%% 2. In-room presence from the joining entity itself (so-called "self-presence")
%% 3. Room history (if any)
%% 4. The room subject
%% 5. Live messages, presence updates, new user joins, etc.
%% As this is the newly created room, we receive only the 2nd stanza.
Make common tests working again
2016-09-13 11:30:05 +02:00
#muc_user{
status_codes = Codes,
items = [#muc_item{role = moderator,
jid = MyJID,
affiliation = owner}]} =
xmpp:get_subtag(?recv1(#presence{from = MyNickJID}), #muc_user{}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
%% 110 -> Inform user that presence refers to itself
%% 201 -> Inform user that a new room has been created
Improve MUC test cases
2014-07-19 15:23:13 +02:00
[110, 201] = lists:sort(Codes),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
%% Request the configuration
#iq{type = result, sub_els = [#muc_owner{config = #xdata{} = RoomCfg}]} =
send_recv(Config, #iq{type = get, sub_els = [#muc_owner{}],
to = Room}),
NewFields =
lists:flatmap(
fun(#xdata_field{var = Var, values = OrigVals}) ->
Vals = case Var of
<<"FORM_TYPE">> ->
OrigVals;
<<"muc#roomconfig_roomname">> ->
[<<"Test room">>];
<<"muc#roomconfig_roomdesc">> ->
[<<"Trying to break the server">>];
<<"muc#roomconfig_persistentroom">> ->
[<<"1">>];
Improve MUC test cases
2014-07-19 15:23:13 +02:00
<<"members_by_default">> ->
[<<"0">>];
<<"muc#roomconfig_allowvoicerequests">> ->
[<<"1">>];
<<"public_list">> ->
[<<"1">>];
<<"muc#roomconfig_publicroom">> ->
[<<"1">>];
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
_ ->
[]
end,
if Vals /= [] ->
[#xdata_field{values = Vals, var = Var}];
true ->
[]
end
end, RoomCfg#xdata.fields),
NewRoomCfg = #xdata{type = submit, fields = NewFields},
Send notifications on MUC configuration changes Notify clients when the room configuration changes, as mandated by XEP-0045, #10.2.1. Closes #623.
2015-07-02 00:36:16 +02:00
ID = send(Config, #iq{type = set, to = Room,
sub_els = [#muc_owner{config = NewRoomCfg}]}),
?recv2(#iq{type = result, id = ID},
#message{from = Room, type = groupchat,
sub_els = [#muc_user{status_codes = [104]}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
%% Set subject
send(Config, #message{to = Room, type = groupchat,
Improve MUC test cases
2014-07-19 15:23:13 +02:00
body = [#text{data = Subject}]}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#message{from = MyNickJID, type = groupchat,
body = [#text{data = Subject}]}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Sending messages (and thus, populating history for our peer)
lists:foreach(
fun(N) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = #text{data = integer_to_binary(N)},
Improve MUC test cases
2014-07-19 15:23:13 +02:00
I = send(Config, #message{to = Room, body = [Text],
type = groupchat}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#message{from = MyNickJID, id = I,
Improve MUC test cases
2014-07-19 15:23:13 +02:00
type = groupchat,
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
body = [Text]})
Improve MUC test cases
2014-07-19 15:23:13 +02:00
end, lists:seq(1, 5)),
%% Inviting the peer
send(Config, #message{to = Room, type = normal,
sub_els =
[#muc_user{
invites =
[#muc_invite{to = PeerJID}]}]}),
Make common tests working again
2016-09-13 11:30:05 +02:00
#muc_user{
items = [#muc_item{role = visitor,
jid = PeerJID,
affiliation = none}]} =
xmpp:get_subtag(?recv1(#presence{from = PeerNickJID}), #muc_user{}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Receiving a voice request
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
#message{from = Room,
Improve MUC test cases
2014-07-19 15:23:13 +02:00
sub_els = [#xdata{type = form,
instructions = [_],
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
fields = VoiceReqFs}]} = recv(Config),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Approving the voice request
ReplyVoiceReqFs =
lists:map(
fun(#xdata_field{var = Var, values = OrigVals}) ->
Vals = case {Var, OrigVals} of
{<<"FORM_TYPE">>,
[<<"http://jabber.org/protocol/muc#request">>]} ->
OrigVals;
{<<"muc#role">>, [<<"participant">>]} ->
[<<"participant">>];
{<<"muc#jid">>, [PeerJIDStr]} ->
[PeerJIDStr];
{<<"muc#roomnick">>, [PeerNick]} ->
[PeerNick];
{<<"muc#request_allow">>, [<<"0">>]} ->
[<<"1">>]
end,
#xdata_field{values = Vals, var = Var}
end, VoiceReqFs),
send(Config, #message{to = Room,
sub_els = [#xdata{type = submit,
fields = ReplyVoiceReqFs}]}),
%% Peer is becoming a participant
Make common tests working again
2016-09-13 11:30:05 +02:00
#muc_user{items = [#muc_item{role = participant,
jid = PeerJID,
affiliation = none}]} =
xmpp:get_subtag(?recv1(#presence{from = PeerNickJID}), #muc_user{}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Receive private message from the peer
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#message{from = PeerNickJID, body = [#text{data = Subject}]}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Granting membership to the peer and localhost server
I1 = send(Config,
#iq{type = set, to = Room,
sub_els =
[#muc_admin{
items = [#muc_item{jid = Localhost,
affiliation = member},
#muc_item{nick = PeerNick,
jid = PeerBareJID,
affiliation = member}]}]}),
%% Peer became a member
Make common tests working again
2016-09-13 11:30:05 +02:00
#muc_user{items = [#muc_item{affiliation = member,
jid = PeerJID,
role = participant}]} =
xmpp:get_subtag(?recv1(#presence{from = PeerNickJID}), #muc_user{}),
mod_muc_room: Notify on affiliation changes Notify the current room occupants if the affiliation of a non-occupant is changed as per example 195 of XEP-0045. In anonymous rooms, only moderators are notified, though.
2016-05-20 01:28:16 +02:00
?recv1(#message{from = Room,
sub_els = [#muc_user{
items = [#muc_item{affiliation = member,
jid = Localhost,
role = none}]}]}),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#iq{type = result, id = I1, sub_els = []}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Receive groupchat message from the peer
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#message{type = groupchat, from = PeerNickJID,
body = [#text{data = Subject}]}),
mod_muc_room: Don't expose JIDs in anonymous rooms Don't let room members retrieve the member list unless the room is non-anonymous.
2016-02-11 22:24:14 +01:00
%% Retrieving a member list
#iq{type = result, sub_els = [#muc_admin{items = MemberList}]} =
send_recv(Config,
#iq{type = get, to = Room,
sub_els =
[#muc_admin{items = [#muc_item{affiliation = member}]}]}),
[#muc_item{affiliation = member,
jid = Localhost},
#muc_item{affiliation = member,
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
jid = PeerBareJID}] = lists:keysort(#muc_item.jid, MemberList),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Kick the peer
I2 = send(Config,
#iq{type = set, to = Room,
sub_els = [#muc_admin{
items = [#muc_item{nick = PeerNick,
role = none}]}]}),
%% Got notification the peer is kicked
%% 307 -> Inform user that he or she has been kicked from the room
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{from = PeerNickJID, type = unavailable,
Improve MUC test cases
2014-07-19 15:23:13 +02:00
sub_els = [#muc_user{
status_codes = [307],
items = [#muc_item{affiliation = member,
jid = PeerJID,
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
role = none}]}]}),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#iq{type = result, id = I2, sub_els = []}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Destroying the room
I3 = send(Config,
#iq{type = set, to = Room,
sub_els = [#muc_owner{
Make common tests working again
2016-09-13 11:30:05 +02:00
destroy = #muc_destroy{
Improve MUC test cases
2014-07-19 15:23:13 +02:00
reason = Subject}}]}),
%% Kicked off
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{from = MyNickJID, type = unavailable,
Improve MUC test cases
2014-07-19 15:23:13 +02:00
sub_els = [#muc_user{items = [#muc_item{role = none,
affiliation = none}],
Make common tests working again
2016-09-13 11:30:05 +02:00
destroy = #muc_destroy{
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
reason = Subject}}]}),
Make common tests working again
2016-09-13 11:30:05 +02:00
?recv1(#iq{type = result, id = I3, sub_els = []}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
disconnect(Config).
muc_slave(Config) ->
PeerJID = ?config(master, Config),
MUC = muc_jid(Config),
Room = muc_room_jid(Config),
MyNick = ?config(slave_nick, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
MyNickJID = jid:replace_resource(Room, MyNick),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
PeerNick = ?config(master_nick, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
PeerNickJID = jid:replace_resource(Room, PeerNick),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
Subject = ?config(room_subject, Config),
%% Receive an invite from the peer
Make common tests working again
2016-09-13 11:30:05 +02:00
#muc_user{invites = [#muc_invite{from = PeerJID}]} =
xmpp:get_subtag(?recv1(#message{from = Room, type = normal}),
#muc_user{}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% But before joining we discover the MUC service first
%% to check if the room is in the disco list
#iq{type = result,
sub_els = [#disco_items{items = [#disco_item{jid = Room}]}]} =
send_recv(Config, #iq{type = get, to = MUC,
sub_els = [#disco_items{}]}),
%% Now check if the peer is in the room. We check this via disco#items
#iq{type = result,
sub_els = [#disco_items{items = [#disco_item{jid = PeerNickJID,
name = PeerNick}]}]} =
send_recv(Config, #iq{type = get, to = Room,
sub_els = [#disco_items{}]}),
%% Now joining
send(Config, #presence{to = MyNickJID, sub_els = [#muc{}]}),
%% First presence is from the participant, i.e. from the peer
Make common tests working again
2016-09-13 11:30:05 +02:00
#muc_user{
status_codes = [],
items = [#muc_item{role = moderator,
affiliation = owner}]} =
xmpp:get_subtag(?recv1(#presence{from = PeerNickJID}), #muc_user{}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% The next is the self-presence (code 110 means it)
Make common tests working again
2016-09-13 11:30:05 +02:00
#muc_user{status_codes = [110],
items = [#muc_item{role = visitor,
affiliation = none}]} =
xmpp:get_subtag(?recv1(#presence{from = MyNickJID}), #muc_user{}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Receive the room subject
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#message{from = PeerNickJID, type = groupchat,
Improve MUC test cases
2014-07-19 15:23:13 +02:00
body = [#text{data = Subject}],
Remove XEP-0091 tags from test suite
2015-05-18 14:38:57 +02:00
sub_els = [#delay{}]}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Receive MUC history
lists:foreach(
fun(N) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = #text{data = integer_to_binary(N)},
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#message{from = PeerNickJID,
Improve MUC test cases
2014-07-19 15:23:13 +02:00
type = groupchat,
body = [Text],
Remove XEP-0091 tags from test suite
2015-05-18 14:38:57 +02:00
sub_els = [#delay{}]})
Improve MUC test cases
2014-07-19 15:23:13 +02:00
end, lists:seq(1, 5)),
%% Sending a voice request
VoiceReq = #xdata{
type = submit,
fields =
[#xdata_field{
var = <<"FORM_TYPE">>,
values = [<<"http://jabber.org/protocol/muc#request">>]},
#xdata_field{
var = <<"muc#role">>,
type = 'text-single',
values = [<<"participant">>]}]},
send(Config, #message{to = Room, sub_els = [VoiceReq]}),
%% Becoming a participant
Make common tests working again
2016-09-13 11:30:05 +02:00
#muc_user{items = [#muc_item{role = participant,
affiliation = none}]} =
xmpp:get_subtag(?recv1(#presence{from = MyNickJID}), #muc_user{}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Sending private message to the peer
send(Config, #message{to = PeerNickJID,
body = [#text{data = Subject}]}),
%% Becoming a member
Make common tests working again
2016-09-13 11:30:05 +02:00
#muc_user{items = [#muc_item{role = participant,
affiliation = member}]} =
xmpp:get_subtag(?recv1(#presence{from = MyNickJID}), #muc_user{}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% Sending groupchat message
send(Config, #message{to = Room, type = groupchat,
body = [#text{data = Subject}]}),
%% Receive this message back
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#message{type = groupchat, from = MyNickJID,
body = [#text{data = Subject}]}),
Improve MUC test cases
2014-07-19 15:23:13 +02:00
%% We're kicked off
%% 307 -> Inform user that he or she has been kicked from the room
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{from = MyNickJID, type = unavailable,
Improve MUC test cases
2014-07-19 15:23:13 +02:00
sub_els = [#muc_user{
status_codes = [307],
items = [#muc_item{affiliation = member,
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
role = none}]}]}),
Add some MUC checks. Several cleanups
2013-06-16 20:00:19 +02:00
disconnect(Config).
Test MUC nick registration
2014-09-03 19:28:07 +02:00
muc_register_nick(Config, MUC, PrevNick, Nick) ->
{Registered, PrevNickVals} = if PrevNick /= <<"">> ->
{true, [PrevNick]};
true ->
{false, []}
end,
%% Request register form
#iq{type = result,
sub_els = [#register{registered = Registered,
xdata = #xdata{type = form,
fields = FsWithoutNick}}]} =
send_recv(Config, #iq{type = get, to = MUC,
sub_els = [#register{}]}),
%% Check if 'nick' field presents
#xdata_field{type = 'text-single',
var = <<"nick">>,
values = PrevNickVals} =
lists:keyfind(<<"nick">>, #xdata_field.var, FsWithoutNick),
X = #xdata{type = submit,
fields = [#xdata_field{var = <<"nick">>, values = [Nick]}]},
%% Submitting form
Make common tests working again
2016-09-13 11:30:05 +02:00
#iq{type = result, sub_els = []} =
Test MUC nick registration
2014-09-03 19:28:07 +02:00
send_recv(Config, #iq{type = set, to = MUC,
sub_els = [#register{xdata = X}]}),
%% Check if the nick was registered
#iq{type = result,
sub_els = [#register{registered = true,
xdata = #xdata{type = form,
fields = FsWithNick}}]} =
send_recv(Config, #iq{type = get, to = MUC,
sub_els = [#register{}]}),
#xdata_field{type = 'text-single', var = <<"nick">>,
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
values = [Nick]} =
Test MUC nick registration
2014-09-03 19:28:07 +02:00
lists:keyfind(<<"nick">>, #xdata_field.var, FsWithNick).
muc_register_master(Config) ->
MUC = muc_jid(Config),
%% Register nick "master1"
muc_register_nick(Config, MUC, <<"">>, <<"master1">>),
%% Unregister nick "master1" via jabber:register
Make common tests working again
2016-09-13 11:30:05 +02:00
#iq{type = result, sub_els = []} =
Test MUC nick registration
2014-09-03 19:28:07 +02:00
send_recv(Config, #iq{type = set, to = MUC,
sub_els = [#register{remove = true}]}),
%% Register nick "master2"
muc_register_nick(Config, MUC, <<"">>, <<"master2">>),
%% Now register nick "master"
muc_register_nick(Config, MUC, <<"master2">>, <<"master">>),
disconnect(Config).
muc_register_slave(Config) ->
MUC = muc_jid(Config),
%% Trying to register occupied nick "master"
X = #xdata{type = submit,
fields = [#xdata_field{var = <<"nick">>,
values = [<<"master">>]}]},
#iq{type = error} =
send_recv(Config, #iq{type = set, to = MUC,
sub_els = [#register{xdata = X}]}),
disconnect(Config).
Add tests for mod_announce
2014-07-27 11:02:46 +02:00
announce_master(Config) ->
MyJID = my_jid(Config),
ServerJID = server_jid(Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
MotdJID = jid:replace_resource(ServerJID, <<"announce/motd">>),
Add tests for mod_announce
2014-07-27 11:02:46 +02:00
MotdText = #text{data = <<"motd">>},
send(Config, #presence{}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{from = MyJID}),
Add tests for mod_announce
2014-07-27 11:02:46 +02:00
%% Set message of the day
send(Config, #message{to = MotdJID, body = [MotdText]}),
%% Receive this message back
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#message{from = ServerJID, body = [MotdText]}),
Add tests for mod_announce
2014-07-27 11:02:46 +02:00
disconnect(Config).
announce_slave(Config) ->
MyJID = my_jid(Config),
ServerJID = server_jid(Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
MotdDelJID = jid:replace_resource(ServerJID, <<"announce/motd/delete">>),
Add tests for mod_announce
2014-07-27 11:02:46 +02:00
MotdText = #text{data = <<"motd">>},
send(Config, #presence{}),
Reorganize mod_announce test in order to avoid race
2014-07-28 11:42:29 +02:00
?recv2(#presence{from = MyJID},
Add tests for mod_announce
2014-07-27 11:02:46 +02:00
#message{from = ServerJID, body = [MotdText]}),
Reorganize mod_announce test in order to avoid race
2014-07-28 11:42:29 +02:00
%% Delete message of the day
send(Config, #message{to = MotdDelJID}),
Add tests for mod_announce
2014-07-27 11:02:46 +02:00
disconnect(Config).
Add tests for XEP-0013
2016-02-10 14:15:43 +01:00
flex_offline_master(Config) ->
Peer = ?config(slave, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
LPeer = jid:remove_resource(Peer),
Add tests for XEP-0013
2016-02-10 14:15:43 +01:00
lists:foreach(
fun(I) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Body = integer_to_binary(I),
Add tests for XEP-0013
2016-02-10 14:15:43 +01:00
send(Config, #message{to = LPeer,
body = [#text{data = Body}],
subject = [#text{data = <<"subject">>}]})
end, lists:seq(1, 5)),
disconnect(Config).
flex_offline_slave(Config) ->
MyJID = my_jid(Config),
MyBareJID = jid:remove_resource(MyJID),
Peer = ?config(master, Config),
Peer_s = jid:to_string(Peer),
true = is_feature_advertised(Config, ?NS_FLEX_OFFLINE),
%% Request disco#info
#iq{type = result,
sub_els = [#disco_info{
node = ?NS_FLEX_OFFLINE,
identities = Ids,
features = Fts,
xdata = [X]}]} =
send_recv(Config, #iq{type = get,
sub_els = [#disco_info{
node = ?NS_FLEX_OFFLINE}]}),
%% Check if we have correct identities
true = lists:any(
fun(#identity{category = <<"automation">>,
type = <<"message-list">>}) -> true;
(_) -> false
end, Ids),
%% Check if we have needed feature
true = lists:member(?NS_FLEX_OFFLINE, Fts),
%% Check xdata, the 'number_of_messages' should be 5
#xdata{type = result,
fields = [#xdata_field{type = hidden,
var = <<"FORM_TYPE">>},
#xdata_field{var = <<"number_of_messages">>,
values = [<<"5">>]}]} = X,
%% Fetch headers,
#iq{type = result,
sub_els = [#disco_items{
node = ?NS_FLEX_OFFLINE,
items = DiscoItems}]} =
send_recv(Config, #iq{type = get,
sub_els = [#disco_items{
node = ?NS_FLEX_OFFLINE}]}),
%% Check if headers are correct
Nodes = lists:sort(
lists:map(
fun(#disco_item{jid = J, name = P, node = N})
when (J == MyBareJID) and (P == Peer_s) ->
N
end, DiscoItems)),
Do not forget sending initial presence in XEP-0013 test
2016-02-11 09:53:33 +01:00
%% Since headers are received we can send initial presence without a risk
%% of getting offline messages flood
send(Config, #presence{}),
?recv1(#presence{from = MyJID}),
Add tests for XEP-0013
2016-02-10 14:15:43 +01:00
%% Check full fetch
I0 = send(Config, #iq{type = get, sub_els = [#offline{fetch = true}]}),
lists:foreach(
fun({I, N}) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = integer_to_binary(I),
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
#message{body = Body, sub_els = SubEls} = recv(Config),
Add tests for XEP-0013
2016-02-10 14:15:43 +01:00
[#text{data = Text}] = Body,
#offline{items = [#offline_item{node = N}]} =
lists:keyfind(offline, 1, SubEls),
#delay{} = lists:keyfind(delay, 1, SubEls)
end, lists:zip(lists:seq(1, 5), Nodes)),
?recv1(#iq{type = result, id = I0, sub_els = []}),
%% Fetch 2nd and 4th message
I1 = send(Config,
#iq{type = get,
sub_els = [#offline{
items = [#offline_item{
action = view,
node = lists:nth(2, Nodes)},
#offline_item{
action = view,
node = lists:nth(4, Nodes)}]}]}),
lists:foreach(
fun({I, N}) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = integer_to_binary(I),
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
#message{body = [#text{data = Text}],
sub_els = SubEls} = recv(Config),
Add tests for XEP-0013
2016-02-10 14:15:43 +01:00
#offline{items = [#offline_item{node = N}]} =
lists:keyfind(offline, 1, SubEls)
end, lists:zip([2, 4], [lists:nth(2, Nodes), lists:nth(4, Nodes)])),
?recv1(#iq{type = result, id = I1, sub_els = []}),
%% Delete 2nd and 4th message
#iq{type = result, sub_els = []} =
send_recv(
Config,
#iq{type = set,
sub_els = [#offline{
items = [#offline_item{
action = remove,
node = lists:nth(2, Nodes)},
#offline_item{
action = remove,
node = lists:nth(4, Nodes)}]}]}),
%% Check if messages were deleted
#iq{type = result,
sub_els = [#disco_items{
node = ?NS_FLEX_OFFLINE,
items = RemainedItems}]} =
send_recv(Config, #iq{type = get,
sub_els = [#disco_items{
node = ?NS_FLEX_OFFLINE}]}),
RemainedNodes = [lists:nth(1, Nodes),
lists:nth(3, Nodes),
lists:nth(5, Nodes)],
RemainedNodes = lists:sort(
lists:map(
fun(#disco_item{node = N}) -> N end,
RemainedItems)),
%% Purge everything left
#iq{type = result, sub_els = []} =
send_recv(Config, #iq{type = set, sub_els = [#offline{purge = true}]}),
%% Check if there is no offline messages
#iq{type = result,
sub_els = [#disco_items{node = ?NS_FLEX_OFFLINE, items = []}]} =
send_recv(Config, #iq{type = get,
sub_els = [#disco_items{
node = ?NS_FLEX_OFFLINE}]}),
disconnect(Config).
Add simple mod_offline checks
2013-06-17 09:15:27 +02:00
offline_master(Config) ->
Peer = ?config(slave, Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
LPeer = jid:remove_resource(Peer),
Add simple mod_offline checks
2013-06-17 09:15:27 +02:00
send(Config, #message{to = LPeer,
body = [#text{data = <<"body">>}],
subject = [#text{data = <<"subject">>}]}),
disconnect(Config).
offline_slave(Config) ->
Peer = ?config(master, Config),
send(Config, #presence{}),
{_, #message{sub_els = SubEls}} =
?recv2(#presence{},
#message{from = Peer,
body = [#text{data = <<"body">>}],
subject = [#text{data = <<"subject">>}]}),
Cleanup the test suite (just a little)
2013-07-06 20:47:47 +02:00
true = lists:keymember(delay, 1, SubEls),
Add simple mod_offline checks
2013-06-17 09:15:27 +02:00
disconnect(Config).
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
carbons_master(Config) ->
MyJID = my_jid(Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
MyBareJID = jid:remove_resource(MyJID),
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
Peer = ?config(slave, Config),
Txt = #text{data = <<"body">>},
true = is_feature_advertised(Config, ?NS_CARBONS_2),
send(Config, #presence{priority = 10}),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{from = MyJID}),
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
wait_for_slave(Config),
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{from = Peer}),
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
%% Enable carbons
#iq{type = result, sub_els = []} =
send_recv(Config,
#iq{type = set,
sub_els = [#carbons_enable{}]}),
%% Send a message to bare and full JID
send(Config, #message{to = MyBareJID, type = chat, body = [Txt]}),
send(Config, #message{to = MyJID, type = chat, body = [Txt]}),
send(Config, #message{to = MyBareJID, type = chat, body = [Txt],
sub_els = [#carbons_private{}]}),
send(Config, #message{to = MyJID, type = chat, body = [Txt],
sub_els = [#carbons_private{}]}),
%% Receive the messages back
?recv4(#message{from = MyJID, to = MyBareJID, type = chat,
body = [Txt], sub_els = []},
#message{from = MyJID, to = MyJID, type = chat,
body = [Txt], sub_els = []},
#message{from = MyJID, to = MyBareJID, type = chat,
body = [Txt], sub_els = [#carbons_private{}]},
#message{from = MyJID, to = MyJID, type = chat,
body = [Txt], sub_els = [#carbons_private{}]}),
%% Disable carbons
#iq{type = result, sub_els = []} =
send_recv(Config,
#iq{type = set,
sub_els = [#carbons_disable{}]}),
wait_for_slave(Config),
%% Repeat the same and leave
send(Config, #message{to = MyBareJID, type = chat, body = [Txt]}),
send(Config, #message{to = MyJID, type = chat, body = [Txt]}),
send(Config, #message{to = MyBareJID, type = chat, body = [Txt],
sub_els = [#carbons_private{}]}),
send(Config, #message{to = MyJID, type = chat, body = [Txt],
sub_els = [#carbons_private{}]}),
?recv4(#message{from = MyJID, to = MyBareJID, type = chat,
body = [Txt], sub_els = []},
#message{from = MyJID, to = MyJID, type = chat,
body = [Txt], sub_els = []},
#message{from = MyJID, to = MyBareJID, type = chat,
body = [Txt], sub_els = [#carbons_private{}]},
#message{from = MyJID, to = MyJID, type = chat,
body = [Txt], sub_els = [#carbons_private{}]}),
disconnect(Config).
carbons_slave(Config) ->
MyJID = my_jid(Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
MyBareJID = jid:remove_resource(MyJID),
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
Peer = ?config(master, Config),
Txt = #text{data = <<"body">>},
wait_for_master(Config),
send(Config, #presence{priority = 5}),
?recv2(#presence{from = MyJID}, #presence{from = Peer}),
%% Enable carbons
#iq{type = result, sub_els = []} =
send_recv(Config,
#iq{type = set,
sub_els = [#carbons_enable{}]}),
%% Receive messages sent by the peer
?recv4(
#message{from = MyBareJID, to = MyJID, type = chat,
sub_els =
[#carbons_sent{
forwarded = #forwarded{
sub_els =
[#message{from = Peer,
to = MyBareJID,
type = chat,
body = [Txt]}]}}]},
#message{from = MyBareJID, to = MyJID, type = chat,
sub_els =
[#carbons_sent{
forwarded = #forwarded{
sub_els =
[#message{from = Peer,
to = Peer,
type = chat,
body = [Txt]}]}}]},
#message{from = MyBareJID, to = MyJID, type = chat,
sub_els =
[#carbons_received{
forwarded = #forwarded{
sub_els =
[#message{from = Peer,
to = MyBareJID,
type = chat,
body = [Txt]}]}}]},
#message{from = MyBareJID, to = MyJID, type = chat,
sub_els =
[#carbons_received{
forwarded = #forwarded{
sub_els =
[#message{from = Peer,
to = Peer,
type = chat,
body = [Txt]}]}}]}),
%% Disable carbons
#iq{type = result, sub_els = []} =
send_recv(Config,
#iq{type = set,
sub_els = [#carbons_disable{}]}),
wait_for_master(Config),
%% Now we should receive nothing but presence unavailable from the peer
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
?recv1(#presence{from = Peer, type = unavailable}),
Add tests for mod_carboncopy
2014-07-20 20:43:16 +02:00
disconnect(Config).
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
mam_old_master(Config) ->
mam_master(Config, ?NS_MAM_TMP).
mam_new_master(Config) ->
mam_master(Config, ?NS_MAM_0).
mam_master(Config, NS) ->
true = is_feature_advertised(Config, NS),
MyJID = my_jid(Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
BareMyJID = jid:remove_resource(MyJID),
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
Peer = ?config(slave, Config),
send(Config, #presence{}),
?recv1(#presence{}),
wait_for_slave(Config),
?recv1(#presence{from = Peer}),
mod_mam: Send new preferences when they are set If a client updates the archiving preferences, include the new preferences with the IQ result (as mandated by XEP-0313).
2016-02-10 23:06:31 +01:00
#iq{type = result, sub_els = [#mam_prefs{xmlns = NS, default = roster}]} =
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
send_recv(Config,
#iq{type = set,
sub_els = [#mam_prefs{xmlns = NS,
default = roster,
never = [MyJID]}]}),
if NS == ?NS_MAM_TMP ->
FakeArchived = #mam_archived{id = randoms:get_string(),
by = server_jid(Config)},
send(Config, #message{to = MyJID,
sub_els = [FakeArchived],
body = [#text{data = <<"a">>}]}),
send(Config, #message{to = BareMyJID,
sub_els = [FakeArchived],
body = [#text{data = <<"b">>}]}),
%% NOTE: The server should strip fake archived tags,
%% i.e. the sub_els received should be [].
?recv2(#message{body = [#text{data = <<"a">>}], sub_els = []},
#message{body = [#text{data = <<"b">>}], sub_els = []});
true ->
ok
end,
wait_for_slave(Config),
lists:foreach(
fun(N) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = #text{data = integer_to_binary(N)},
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
send(Config,
#message{to = Peer, body = [Text]})
end, lists:seq(1, 5)),
?recv1(#presence{type = unavailable, from = Peer}),
mam_query_all(Config, NS),
mam_query_with(Config, Peer, NS),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
%% mam_query_with(Config, jid:remove_resource(Peer)),
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
mam_query_rsm(Config, NS),
mod_mam: Send new preferences when they are set If a client updates the archiving preferences, include the new preferences with the IQ result (as mandated by XEP-0313).
2016-02-10 23:06:31 +01:00
#iq{type = result, sub_els = [#mam_prefs{xmlns = NS, default = never}]} =
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
send_recv(Config, #iq{type = set,
sub_els = [#mam_prefs{xmlns = NS,
default = never}]}),
disconnect(Config).
mam_old_slave(Config) ->
mam_slave(Config, ?NS_MAM_TMP).
mam_new_slave(Config) ->
mam_slave(Config, ?NS_MAM_0).
mam_slave(Config, NS) ->
Peer = ?config(master, Config),
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
MyJID = my_jid(Config),
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
ServerJID = server_jid(Config),
wait_for_master(Config),
send(Config, #presence{}),
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
?recv2(#presence{from = MyJID}, #presence{from = Peer}),
mod_mam: Send new preferences when they are set If a client updates the archiving preferences, include the new preferences with the IQ result (as mandated by XEP-0313).
2016-02-10 23:06:31 +01:00
#iq{type = result, sub_els = [#mam_prefs{xmlns = NS, default = always}]} =
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
send_recv(Config,
#iq{type = set,
sub_els = [#mam_prefs{xmlns = NS, default = always}]}),
wait_for_master(Config),
lists:foreach(
fun(N) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = #text{data = integer_to_binary(N)},
Make common tests working again
2016-09-13 11:30:05 +02:00
Msg = ?recv1(#message{from = Peer, body = [Text]}),
#mam_archived{by = ServerJID} =
xmpp:get_subtag(Msg, #mam_archived{}),
#stanza_id{by = ServerJID} =
xmpp:get_subtag(Msg, #stanza_id{})
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
end, lists:seq(1, 5)),
mod_mam: Send new preferences when they are set If a client updates the archiving preferences, include the new preferences with the IQ result (as mandated by XEP-0313).
2016-02-10 23:06:31 +01:00
#iq{type = result, sub_els = [#mam_prefs{xmlns = NS, default = never}]} =
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
send_recv(Config, #iq{type = set,
sub_els = [#mam_prefs{xmlns = NS, default = never}]}),
disconnect(Config).
mam_query_all(Config, NS) ->
QID = randoms:get_string(),
MyJID = my_jid(Config),
Peer = ?config(slave, Config),
Fix MAM tests (EJABS-2480).
2015-07-07 18:42:50 +02:00
Type = case NS of
?NS_MAM_TMP -> get;
_ -> set
end,
I = send(Config, #iq{type = Type, sub_els = [#mam_query{xmlns = NS, id = QID}]}),
Improve namespace handling
2016-09-24 13:17:21 +02:00
maybe_recv_iq_result(Config, NS, I),
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
Iter = if NS == ?NS_MAM_TMP -> lists:seq(1, 5);
true -> lists:seq(1, 5) ++ lists:seq(1, 5)
end,
lists:foreach(
fun(N) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = #text{data = integer_to_binary(N)},
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
?recv1(#message{to = MyJID,
sub_els =
[#mam_result{
queryid = QID,
sub_els =
[#forwarded{
delay = #delay{},
sub_els =
[#message{
from = MyJID, to = Peer,
body = [Text]}]}]}]})
end, Iter),
if NS == ?NS_MAM_TMP ->
Update MAM tests to always expect RSM in response
2015-08-30 23:26:37 +02:00
?recv1(#iq{type = result, id = I,
sub_els = [#mam_query{xmlns = NS, id = QID}]});
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
true ->
Add "complete" attribute to MAM final response (EJABS-2484)
2015-07-10 12:02:42 +02:00
?recv1(#message{sub_els = [#mam_fin{complete = true, id = QID}]})
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
end.
mam_query_with(Config, JID, NS) ->
MyJID = my_jid(Config),
Peer = ?config(slave, Config),
Fix MAM tests (EJABS-2480).
2015-07-07 18:42:50 +02:00
{Query, Type} = if NS == ?NS_MAM_TMP ->
{#mam_query{xmlns = NS, with = JID}, get};
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
true ->
Fs = [#xdata_field{var = <<"jid">>,
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
values = [jid:to_string(JID)]}],
Fix MAM tests (EJABS-2480).
2015-07-07 18:42:50 +02:00
{#mam_query{xmlns = NS,
xdata = #xdata{type = submit, fields = Fs}}, set}
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
end,
Fix MAM tests (EJABS-2480).
2015-07-07 18:42:50 +02:00
I = send(Config, #iq{type = Type, sub_els = [Query]}),
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
Iter = if NS == ?NS_MAM_TMP -> lists:seq(1, 5);
true -> lists:seq(1, 5) ++ lists:seq(1, 5)
end,
Improve namespace handling
2016-09-24 13:17:21 +02:00
maybe_recv_iq_result(Config, NS, I),
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
lists:foreach(
fun(N) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = #text{data = integer_to_binary(N)},
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
?recv1(#message{to = MyJID,
sub_els =
[#mam_result{
sub_els =
[#forwarded{
delay = #delay{},
sub_els =
[#message{
from = MyJID, to = Peer,
body = [Text]}]}]}]})
end, Iter),
if NS == ?NS_MAM_TMP ->
Update MAM tests to always expect RSM in response
2015-08-30 23:26:37 +02:00
?recv1(#iq{type = result, id = I,
sub_els = [#mam_query{xmlns = NS}]});
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
true ->
Add "complete" attribute to MAM final response (EJABS-2484)
2015-07-10 12:02:42 +02:00
?recv1(#message{sub_els = [#mam_fin{complete = true}]})
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
end.
Improve namespace handling
2016-09-24 13:17:21 +02:00
maybe_recv_iq_result(Config, ?NS_MAM_0, I1) ->
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
?recv1(#iq{type = result, id = I1});
Improve namespace handling
2016-09-24 13:17:21 +02:00
maybe_recv_iq_result(_, _, _) ->
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
ok.
mam_query_rsm(Config, NS) ->
MyJID = my_jid(Config),
Peer = ?config(slave, Config),
Fix MAM tests (EJABS-2480).
2015-07-07 18:42:50 +02:00
Type = case NS of
?NS_MAM_TMP -> get;
_ -> set
end,
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
%% Get the first 3 items out of 5
I1 = send(Config,
Fix MAM tests (EJABS-2480).
2015-07-07 18:42:50 +02:00
#iq{type = Type,
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
sub_els = [#mam_query{xmlns = NS, rsm = #rsm_set{max = 3}}]}),
Improve namespace handling
2016-09-24 13:17:21 +02:00
maybe_recv_iq_result(Config, NS, I1),
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
lists:foreach(
fun(N) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = #text{data = integer_to_binary(N)},
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
?recv1(#message{to = MyJID,
sub_els =
[#mam_result{
xmlns = NS,
sub_els =
[#forwarded{
delay = #delay{},
sub_els =
[#message{
from = MyJID, to = Peer,
body = [Text]}]}]}]})
end, lists:seq(1, 3)),
if NS == ?NS_MAM_TMP ->
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
#iq{type = result, id = I1,
sub_els = [#mam_query{xmlns = NS,
rsm = #rsm_set{last = Last,
count = 5}}]} =
recv(Config);
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
true ->
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
#message{sub_els = [#mam_fin{
complete = false,
rsm = #rsm_set{last = Last,
count = 10}}]} =
recv(Config)
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
end,
%% Get the next items starting from the `Last`.
%% Limit the response to 2 items.
I2 = send(Config,
Fix MAM tests (EJABS-2480).
2015-07-07 18:42:50 +02:00
#iq{type = Type,
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
sub_els = [#mam_query{xmlns = NS,
rsm = #rsm_set{max = 2,
'after' = Last}}]}),
Improve namespace handling
2016-09-24 13:17:21 +02:00
maybe_recv_iq_result(Config, NS, I2),
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
lists:foreach(
fun(N) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = #text{data = integer_to_binary(N)},
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
?recv1(#message{to = MyJID,
sub_els =
[#mam_result{
xmlns = NS,
sub_els =
[#forwarded{
delay = #delay{},
sub_els =
[#message{
from = MyJID, to = Peer,
body = [Text]}]}]}]})
end, lists:seq(4, 5)),
if NS == ?NS_MAM_TMP ->
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
#iq{type = result, id = I2,
sub_els = [#mam_query{
xmlns = NS,
rsm = #rsm_set{
count = 5,
first = #rsm_first{data = First}}}]} =
recv(Config);
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
true ->
Get rid of compile warnings in test suite
2016-09-25 07:38:41 +02:00
#message{
sub_els = [#mam_fin{
complete = false,
rsm = #rsm_set{
count = 10,
first = #rsm_first{data = First}}}]} =
recv(Config)
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
end,
Add "complete" attribute to MAM final response (EJABS-2484)
2015-07-10 12:02:42 +02:00
%% Paging back. Should receive 3 elements: 1, 2, 3.
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
I3 = send(Config,
Fix MAM tests (EJABS-2480).
2015-07-07 18:42:50 +02:00
#iq{type = Type,
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
sub_els = [#mam_query{xmlns = NS,
Add "complete" attribute to MAM final response (EJABS-2484)
2015-07-10 12:02:42 +02:00
rsm = #rsm_set{max = 3,
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
before = First}}]}),
Improve namespace handling
2016-09-24 13:17:21 +02:00
maybe_recv_iq_result(Config, NS, I3),
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
lists:foreach(
fun(N) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = #text{data = integer_to_binary(N)},
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
?recv1(#message{to = MyJID,
sub_els =
[#mam_result{
xmlns = NS,
sub_els =
[#forwarded{
delay = #delay{},
sub_els =
[#message{
from = MyJID, to = Peer,
body = [Text]}]}]}]})
Add "complete" attribute to MAM final response (EJABS-2484)
2015-07-10 12:02:42 +02:00
end, lists:seq(1, 3)),
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
if NS == ?NS_MAM_TMP ->
?recv1(#iq{type = result, id = I3,
sub_els = [#mam_query{xmlns = NS, rsm = #rsm_set{count = 5}}]});
true ->
?recv1(#message{
Add "complete" attribute to MAM final response (EJABS-2484)
2015-07-10 12:02:42 +02:00
sub_els = [#mam_fin{complete = true,
rsm = #rsm_set{count = 10}}]})
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
end,
%% Getting the item count. Should be 5 (or 10).
I4 = send(Config,
Fix MAM tests (EJABS-2480).
2015-07-07 18:42:50 +02:00
#iq{type = Type,
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
sub_els = [#mam_query{xmlns = NS,
rsm = #rsm_set{max = 0}}]}),
Improve namespace handling
2016-09-24 13:17:21 +02:00
maybe_recv_iq_result(Config, NS, I4),
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
if NS == ?NS_MAM_TMP ->
?recv1(#iq{type = result, id = I4,
sub_els = [#mam_query{
xmlns = NS,
rsm = #rsm_set{count = 5,
first = undefined,
last = undefined}}]});
true ->
?recv1(#message{
sub_els = [#mam_fin{
Add "complete" attribute to MAM final response (EJABS-2484)
2015-07-10 12:02:42 +02:00
complete = false,
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
rsm = #rsm_set{count = 10,
first = undefined,
last = undefined}}]})
Fix mod_mam compatibility with RSM for other backends
2015-07-09 12:01:37 +02:00
end,
%% Should receive 2 last messages
I5 = send(Config,
#iq{type = Type,
sub_els = [#mam_query{xmlns = NS,
rsm = #rsm_set{max = 2,
Make common tests working again
2016-09-13 11:30:05 +02:00
before = <<"">>}}]}),
Improve namespace handling
2016-09-24 13:17:21 +02:00
maybe_recv_iq_result(Config, NS, I5),
Fix mod_mam compatibility with RSM for other backends
2015-07-09 12:01:37 +02:00
lists:foreach(
fun(N) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Text = #text{data = integer_to_binary(N)},
Fix mod_mam compatibility with RSM for other backends
2015-07-09 12:01:37 +02:00
?recv1(#message{to = MyJID,
sub_els =
[#mam_result{
xmlns = NS,
sub_els =
[#forwarded{
delay = #delay{},
sub_els =
[#message{
from = MyJID, to = Peer,
body = [Text]}]}]}]})
end, lists:seq(4, 5)),
if NS == ?NS_MAM_TMP ->
?recv1(#iq{type = result, id = I5,
sub_els = [#mam_query{xmlns = NS, rsm = #rsm_set{count = 5}}]});
true ->
?recv1(#message{
Add "complete" attribute to MAM final response (EJABS-2484)
2015-07-10 12:02:42 +02:00
sub_els = [#mam_fin{complete = false,
rsm = #rsm_set{count = 10}}]})
Add MAM (XEP-0313) support
2015-06-22 15:56:08 +02:00
end.
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
client_state_master(Config) ->
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
true = ?config(csi, Config),
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
Peer = ?config(slave, Config),
Presence = #presence{to = Peer},
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
ChatState = #message{to = Peer, thread = <<"1">>,
sub_els = [#chatstate{type = active}]},
Message = ChatState#message{body = [#text{data = <<"body">>}]},
Improve namespace handling
2016-09-24 13:17:21 +02:00
PepPayload = xmpp:encode(#presence{}),
mod_client_state: Add "queue_pep" option If the new "queue_pep" option is enabled and the client is inactive, PEP notifications are throttled in a similar way to presence stanzas and chat states. Only the most recent notification of a given node and payload type will be queued from a given contact.
2016-05-17 22:12:04 +02:00
PepOne = #message{
to = Peer,
sub_els =
Make common tests working again
2016-09-13 11:30:05 +02:00
[#ps_event{
mod_client_state: Add "queue_pep" option If the new "queue_pep" option is enabled and the client is inactive, PEP notifications are throttled in a similar way to presence stanzas and chat states. Only the most recent notification of a given node and payload type will be queued from a given contact.
2016-05-17 22:12:04 +02:00
items =
Make common tests working again
2016-09-13 11:30:05 +02:00
#ps_items{
node = <<"foo-1">>,
items =
[#ps_item{
id = <<"pep-1">>,
xml_els = [PepPayload]}]}}]},
mod_client_state: Add "queue_pep" option If the new "queue_pep" option is enabled and the client is inactive, PEP notifications are throttled in a similar way to presence stanzas and chat states. Only the most recent notification of a given node and payload type will be queued from a given contact.
2016-05-17 22:12:04 +02:00
PepTwo = #message{
to = Peer,
sub_els =
Make common tests working again
2016-09-13 11:30:05 +02:00
[#ps_event{
mod_client_state: Add "queue_pep" option If the new "queue_pep" option is enabled and the client is inactive, PEP notifications are throttled in a similar way to presence stanzas and chat states. Only the most recent notification of a given node and payload type will be queued from a given contact.
2016-05-17 22:12:04 +02:00
items =
Make common tests working again
2016-09-13 11:30:05 +02:00
#ps_items{
node = <<"foo-2">>,
items =
[#ps_item{
id = <<"pep-2">>,
xml_els = [PepPayload]}]}}]},
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
%% Wait for the slave to become inactive.
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
wait_for_slave(Config),
%% Should be queued (but see below):
CSI test: Fix race when slave becomes active again Make sure the server processed the slave's active request after the previous test stanzas were received by the slave and before the final Chat State notification is sent by the master.
2015-04-16 08:45:17 +02:00
send(Config, Presence),
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
%% Should replace the previous presence in the queue:
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
send(Config, Presence#presence{type = unavailable}),
mod_client_state: Add "queue_pep" option If the new "queue_pep" option is enabled and the client is inactive, PEP notifications are throttled in a similar way to presence stanzas and chat states. Only the most recent notification of a given node and payload type will be queued from a given contact.
2016-05-17 22:12:04 +02:00
%% The following two PEP stanzas should be queued (but see below):
send(Config, PepOne),
send(Config, PepTwo),
%% The following two PEP stanzas should replace the previous two:
send(Config, PepOne),
send(Config, PepTwo),
mod_client_state: Queue chat state notifications Queue standalone chat states instead of simply dropping them when the client is inactive. Only the most recent chat state of a given client is queued.
2016-05-17 20:55:45 +02:00
%% Should be queued (but see below):
send(Config, ChatState),
%% Should replace the previous chat state in the queue:
send(Config, ChatState#message{sub_els = [#chatstate{type = composing}]}),
%% Should be sent immediately, together with the queued stanzas:
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
send(Config, Message),
CSI test: Fix race when slave becomes active again Make sure the server processed the slave's active request after the previous test stanzas were received by the slave and before the final Chat State notification is sent by the master.
2015-04-16 08:45:17 +02:00
%% Wait for the slave to become active.
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
wait_for_slave(Config),
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
%% Should be delivered, as the client is active again:
send(Config, ChatState),
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
disconnect(Config).
client_state_slave(Config) ->
Peer = ?config(master, Config),
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
change_client_state(Config, inactive),
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
wait_for_master(Config),
CSI test: Fix race when slave becomes active again Make sure the server processed the slave's active request after the previous test stanzas were received by the slave and before the final Chat State notification is sent by the master.
2015-04-16 08:45:17 +02:00
?recv1(#presence{from = Peer, type = unavailable,
Remove XEP-0091 tags from test suite
2015-05-18 14:38:57 +02:00
sub_els = [#delay{}]}),
mod_client_state: Add "queue_pep" option If the new "queue_pep" option is enabled and the client is inactive, PEP notifications are throttled in a similar way to presence stanzas and chat states. Only the most recent notification of a given node and payload type will be queued from a given contact.
2016-05-17 22:12:04 +02:00
#message{
from = Peer,
sub_els =
Make common tests working again
2016-09-13 11:30:05 +02:00
[#ps_event{
mod_client_state: Add "queue_pep" option If the new "queue_pep" option is enabled and the client is inactive, PEP notifications are throttled in a similar way to presence stanzas and chat states. Only the most recent notification of a given node and payload type will be queued from a given contact.
2016-05-17 22:12:04 +02:00
items =
Make common tests working again
2016-09-13 11:30:05 +02:00
#ps_items{
node = <<"foo-1">>,
items =
[#ps_item{
id = <<"pep-1">>}]}},
Improve namespace handling
2016-09-24 13:17:21 +02:00
#delay{}]} = recv(Config),
mod_client_state: Add "queue_pep" option If the new "queue_pep" option is enabled and the client is inactive, PEP notifications are throttled in a similar way to presence stanzas and chat states. Only the most recent notification of a given node and payload type will be queued from a given contact.
2016-05-17 22:12:04 +02:00
#message{
from = Peer,
sub_els =
Make common tests working again
2016-09-13 11:30:05 +02:00
[#ps_event{
mod_client_state: Add "queue_pep" option If the new "queue_pep" option is enabled and the client is inactive, PEP notifications are throttled in a similar way to presence stanzas and chat states. Only the most recent notification of a given node and payload type will be queued from a given contact.
2016-05-17 22:12:04 +02:00
items =
Make common tests working again
2016-09-13 11:30:05 +02:00
#ps_items{
node = <<"foo-2">>,
items =
[#ps_item{
id = <<"pep-2">>}]}},
Improve namespace handling
2016-09-24 13:17:21 +02:00
#delay{}]} = recv(Config),
mod_client_state: Queue chat state notifications Queue standalone chat states instead of simply dropping them when the client is inactive. Only the most recent chat state of a given client is queued.
2016-05-17 20:55:45 +02:00
?recv1(#message{from = Peer, thread = <<"1">>,
sub_els = [#chatstate{type = composing},
#delay{}]}),
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
?recv1(#message{from = Peer, thread = <<"1">>,
body = [#text{data = <<"body">>}],
sub_els = [#chatstate{type = active}]}),
change_client_state(Config, active),
CSI test: Fix race when slave becomes active again Make sure the server processed the slave's active request after the previous test stanzas were received by the slave and before the final Chat State notification is sent by the master.
2015-04-16 08:45:17 +02:00
wait_for_master(Config),
?recv1(#message{from = Peer, thread = <<"1">>,
Avoid generation of excessive records
2014-09-13 20:54:07 +02:00
sub_els = [#chatstate{type = active}]}),
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
disconnect(Config).
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
%%%===================================================================
%%% Aux functions
%%%===================================================================
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
change_client_state(Config, NewState) ->
send(Config, #csi{type = NewState}),
send_recv(Config, #iq{type = get, to = server_jid(Config),
sub_els = [#ping{}]}).
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
bookmark_conference() ->
#bookmark_conference{name = <<"Some name">>,
autojoin = true,
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
jid = jid:make(
Switch to rebar build tool Use dynamic Rebar configuration Make iconv dependency optional Disable transient_supervisors compile option Add hipe compilation support Only compile ibrowse and lhttpc when needed Make it possible to generate an OTP application release Add --enable-debug compile option Add --enable-all compiler option Add --enable-tools configure option Add --with-erlang configure option. Add --enable-erlang-version-check configure option. Add lager support Improve the test suite
2013-04-08 11:12:54 +02:00
<<"some">>,
<<"some.conference.org">>,
<<>>)}.
Add zlib compression test case
2013-06-14 16:45:04 +02:00
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
socks5_connect(#streamhost{host = Host, port = Port},
{SID, JID1, JID2}) ->
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
Hash = p1_sha:sha([SID, jid:to_string(JID1), jid:to_string(JID2)]),
Add mod_proxy65 test case
2013-06-15 18:45:18 +02:00
{ok, Sock} = gen_tcp:connect(binary_to_list(Host), Port,
[binary, {active, false}]),
Init = <<?VERSION_5, 1, ?AUTH_ANONYMOUS>>,
InitAck = <<?VERSION_5, ?AUTH_ANONYMOUS>>,
Req = <<?VERSION_5, ?CMD_CONNECT, 0,
?ATYP_DOMAINNAME, 40, Hash:40/binary, 0, 0>>,
Resp = <<?VERSION_5, ?SUCCESS, 0, ?ATYP_DOMAINNAME,
40, Hash:40/binary, 0, 0>>,
gen_tcp:send(Sock, Init),
{ok, InitAck} = gen_tcp:recv(Sock, size(InitAck)),
gen_tcp:send(Sock, Req),
{ok, Resp} = gen_tcp:recv(Sock, size(Resp)),
Sock.
socks5_send(Sock, Data) ->
ok = gen_tcp:send(Sock, Data).
socks5_recv(Sock, Data) ->
{ok, Data} = gen_tcp:recv(Sock, size(Data)).
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
%%%===================================================================
%%% SQL stuff
%%%===================================================================
Add SQLite support
2015-03-16 19:53:19 +01:00
create_sql_tables(sqlite, _BaseDir) ->
ok;
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
create_sql_tables(Type, BaseDir) ->
{VHost, File} = case Type of
mysql ->
{?MYSQL_VHOST, "mysql.sql"};
pgsql ->
{?PGSQL_VHOST, "pg.sql"}
end,
SQLFile = filename:join([BaseDir, "sql", File]),
CreationQueries = read_sql_queries(SQLFile),
DropTableQueries = drop_table_queries(CreationQueries),
Rename odbc to sql everywhere
2016-04-20 11:27:32 +02:00
case ejabberd_sql:sql_transaction(
Add tests for modules using MySQL/PostgreSQL
2013-06-19 12:11:20 +02:00
VHost, DropTableQueries ++ CreationQueries) of
{atomic, ok} ->
ok;
Err ->
ct:fail({failed_to_create_sql_tables, Type, Err})
end.
read_sql_queries(File) ->
case file:open(File, [read, binary]) of
{ok, Fd} ->
read_lines(Fd, File, []);
Err ->
ct:fail({open_file_failed, File, Err})
end.
drop_table_queries(Queries) ->
lists:foldl(
fun(Query, Acc) ->
case split(str:to_lower(Query)) of
[<<"create">>, <<"table">>, Table|_] ->
[<<"DROP TABLE IF EXISTS ", Table/binary, ";">>|Acc];
_ ->
Acc
end
end, [], Queries).
read_lines(Fd, File, Acc) ->
case file:read_line(Fd) of
{ok, Line} ->
NewAcc = case str:strip(str:strip(Line, both, $\r), both, $\n) of
<<"--", _/binary>> ->
Acc;
<<>> ->
Acc;
_ ->
[Line|Acc]
end,
read_lines(Fd, File, NewAcc);
eof ->
QueryList = str:tokens(list_to_binary(lists:reverse(Acc)), <<";">>),
lists:flatmap(
fun(Query) ->
case str:strip(str:strip(Query, both, $\r), both, $\n) of
<<>> ->
[];
Q ->
[<<Q/binary, $;>>]
end
end, QueryList);
{error, _} = Err ->
ct:fail({read_file_failed, File, Err})
end.
split(Data) ->
lists:filter(
fun(<<>>) ->
false;
(_) ->
true
end, re:split(Data, <<"\s">>)).
Clear Riak data when initializing the testing suite
2014-07-09 16:44:48 +02:00
clear_riak_tables(Config) ->
User = ?config(user, Config),
Server = ?config(server, Config),
Room = muc_room_jid(Config),
Get rid of calls to jlib.erl from tests
2016-02-11 10:19:23 +01:00
{URoom, SRoom, _} = jid:tolower(Room),
Do not call functions from ejabberd_riak directly
2014-08-12 12:13:44 +02:00
ejabberd_auth:remove_user(User, Server),
ejabberd_auth:remove_user(<<"test_slave">>, Server),
ejabberd_auth:remove_user(<<"test_master">>, Server),
mod_muc:forget_room(Server, URoom, SRoom),
Test MUC nick registration
2014-09-03 19:28:07 +02:00
ejabberd_riak:delete(muc_registered, {{<<"test_slave">>, Server}, SRoom}),
ejabberd_riak:delete(muc_registered, {{<<"test_master">>, Server}, SRoom}),
Clear Riak data when initializing the testing suite
2014-07-09 16:44:48 +02:00
Config.