diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-01-14 19:33:23 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-01-14 19:33:23 +0300 |
| commit | 63259f5cc90e3d0b5b5e59f4c586449176daa078 (patch) | |
| tree | 321b6a4bac0fc73bfe0d8c998b0b7e487cc407ab /test/private_tests.erl | |
| parent | Don't produce a crash on config reload when SQL is not configured (diff) | |
Improve private and MAM tests in order to reflect
database backends with limited capabilities
Diffstat (limited to 'test/private_tests.erl')
| -rw-r--r-- | test/private_tests.erl | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/test/private_tests.erl b/test/private_tests.erl index d430cb40..5ae832b3 100644 --- a/test/private_tests.erl +++ b/test/private_tests.erl @@ -24,7 +24,7 @@ %% API -compile(export_all). --import(suite, [my_jid/1, is_feature_advertised/3, +-import(suite, [my_jid/1, server_jid/1, is_feature_advertised/3, send_recv/2, disconnect/1]). -include("suite.hrl"). @@ -43,9 +43,15 @@ single_cases() -> single_test(test_published)]}. test_features(Config) -> + Server = jid:encode(server_jid(Config)), MyJID = my_jid(Config), - true = is_feature_advertised(Config, ?NS_BOOKMARKS_CONVERSION_0, - jid:remove_resource(MyJID)), + case gen_mod:is_loaded(Server, mod_pubsub) of + true -> + true = is_feature_advertised(Config, ?NS_BOOKMARKS_CONVERSION_0, + jid:remove_resource(MyJID)); + false -> + ok + end, disconnect(Config). test_no_namespace(Config) -> @@ -73,20 +79,26 @@ test_set_get(Config) -> disconnect(Config). test_published(Config) -> - Storage = bookmark_storage(), - Node = xmpp:get_ns(Storage), - #iq{type = result, - sub_els = [#pubsub{items = #ps_items{node = Node, items = Items}}]} = - send_recv( - Config, - #iq{type = get, - sub_els = [#pubsub{items = #ps_items{node = Node}}]}), - [#ps_item{sub_els = [StorageXMLIn]}] = Items, - Storage = xmpp:decode(StorageXMLIn), - #iq{type = result, sub_els = []} = - send_recv(Config, - #iq{type = set, - sub_els = [#pubsub_owner{delete = {Node, <<>>}}]}), + Server = jid:encode(server_jid(Config)), + case gen_mod:is_loaded(Server, mod_pubsub) of + true -> + Storage = bookmark_storage(), + Node = xmpp:get_ns(Storage), + #iq{type = result, + sub_els = [#pubsub{items = #ps_items{node = Node, items = Items}}]} = + send_recv( + Config, + #iq{type = get, + sub_els = [#pubsub{items = #ps_items{node = Node}}]}), + [#ps_item{sub_els = [StorageXMLIn]}] = Items, + Storage = xmpp:decode(StorageXMLIn), + #iq{type = result, sub_els = []} = + send_recv(Config, + #iq{type = set, + sub_els = [#pubsub_owner{delete = {Node, <<>>}}]}); + false -> + ok + end, disconnect(Config). %%%=================================================================== |