diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/ejabberd_SUITE.erl | 9 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.yml | 1 | ||||
| -rw-r--r-- | test/ejabberd_sm_mock.exs | 2 | ||||
| -rw-r--r-- | test/jid_test.exs | 2 | ||||
| -rw-r--r-- | test/mod_admin_extra_test.exs | 2 | ||||
| -rw-r--r-- | test/mod_last_mock.exs | 2 | ||||
| -rw-r--r-- | test/mod_legacy.erl | 54 |
7 files changed, 4 insertions, 68 deletions
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl index e8e475554..a0a6795b9 100644 --- a/test/ejabberd_SUITE.erl +++ b/test/ejabberd_SUITE.erl @@ -363,7 +363,6 @@ no_db_tests() -> unsupported_query, bad_nonza, invalid_from, - legacy_iq, ping, version, time, @@ -941,14 +940,6 @@ presence_broadcast(Config) -> end, [], [0, 100, 200, 2000, 5000, 10000]), disconnect(Config). -legacy_iq(Config) -> - true = is_feature_advertised(Config, ?NS_EVENT), - ServerJID = server_jid(Config), - #iq{type = result, sub_els = []} = - send_recv(Config, #iq{to = ServerJID, type = get, - sub_els = [#xevent{}]}), - disconnect(Config). - ping(Config) -> true = is_feature_advertised(Config, ?NS_PING), #iq{type = result, sub_els = []} = diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml index abc6d195a..cea7512e6 100644 --- a/test/ejabberd_SUITE_data/ejabberd.yml +++ b/test/ejabberd_SUITE_data/ejabberd.yml @@ -490,7 +490,6 @@ modules: mod_disco: [] mod_ping: [] mod_proxy65: [] - mod_legacy: [] mod_muc: [] mod_muc_admin: [] mod_register: diff --git a/test/ejabberd_sm_mock.exs b/test/ejabberd_sm_mock.exs index 1f1247a00..9ac739ba5 100644 --- a/test/ejabberd_sm_mock.exs +++ b/test/ejabberd_sm_mock.exs @@ -23,7 +23,7 @@ defmodule EjabberdSmMock do require Record Record.defrecord :session, Record.extract(:session, from_lib: "ejabberd/include/ejabberd_sm.hrl") - Record.defrecord :jid, Record.extract(:jid, from_lib: "ejabberd/include/jlib.hrl") + Record.defrecord :jid, Record.extract(:jid, from_lib: "xmpp/include/jid.hrl") @agent __MODULE__ diff --git a/test/jid_test.exs b/test/jid_test.exs index 0701d699f..aa3563bea 100644 --- a/test/jid_test.exs +++ b/test/jid_test.exs @@ -24,7 +24,7 @@ defmodule JidTest do use ExUnit.Case, async: true require Record - Record.defrecord :jid, Record.extract(:jid, from_lib: "ejabberd/include/jlib.hrl") + Record.defrecord :jid, Record.extract(:jid, from_lib: "xmpp/include/jid.hrl") setup_all do :stringprep.start diff --git a/test/mod_admin_extra_test.exs b/test/mod_admin_extra_test.exs index fd6a83e90..9b154fdb5 100644 --- a/test/mod_admin_extra_test.exs +++ b/test/mod_admin_extra_test.exs @@ -34,7 +34,7 @@ defmodule EjabberdModAdminExtraTest do @resource "resource" require Record - Record.defrecord :jid, Record.extract(:jid, from_lib: "ejabberd/include/jlib.hrl") + Record.defrecord :jid, Record.extract(:jid, from_lib: "xmpp/include/jid.hrl") setup_all do try do diff --git a/test/mod_last_mock.exs b/test/mod_last_mock.exs index 2a22f6ca1..25f2bd473 100644 --- a/test/mod_last_mock.exs +++ b/test/mod_last_mock.exs @@ -22,7 +22,7 @@ defmodule ModLastMock do require Record Record.defrecord :session, Record.extract(:session, from_lib: "ejabberd/include/ejabberd_sm.hrl") - Record.defrecord :jid, Record.extract(:jid, from_lib: "ejabberd/include/jlib.hrl") + Record.defrecord :jid, Record.extract(:jid, from_lib: "xmpp/include/jid.hrl") @author "jsautret@process-one.net" @agent __MODULE__ diff --git a/test/mod_legacy.erl b/test/mod_legacy.erl deleted file mode 100644 index 96c1e041f..000000000 --- a/test/mod_legacy.erl +++ /dev/null @@ -1,54 +0,0 @@ -%%%------------------------------------------------------------------- -%%% Author : Evgeny Khramtsov <ekhramtsov@process-one.net> -%%% Created : 25 Sep 2016 by Evgeny Khramtsov <ekhramtsov@process-one.net> -%%% -%%% -%%% ejabberd, Copyright (C) 2002-2017 ProcessOne -%%% -%%% This program is free software; you can redistribute it and/or -%%% modify it under the terms of the GNU General Public License as -%%% published by the Free Software Foundation; either version 2 of the -%%% License, or (at your option) any later version. -%%% -%%% This program is distributed in the hope that it will be useful, -%%% but WITHOUT ANY WARRANTY; without even the implied warranty of -%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -%%% General Public License for more details. -%%% -%%% You should have received a copy of the GNU General Public License along -%%% with this program; if not, write to the Free Software Foundation, Inc., -%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -%%% -%%%---------------------------------------------------------------------- - --module(mod_legacy). --behaviour(gen_mod). - -%% API --export([start/2, stop/1, mod_opt_type/1, depends/2, process_iq/3]). --include("jlib.hrl"). - -%%%=================================================================== -%%% API -%%%=================================================================== -start(Host, _Opts) -> - gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_EVENT, - ?MODULE, process_iq). - -stop(Host) -> - gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?MODULE). - -mod_opt_type(_) -> - []. - -depends(_, _) -> - []. - -mod_options(_) -> - []. - -%%%=================================================================== -%%% Internal functions -%%%=================================================================== -process_iq(_From, _To, IQ) -> - IQ#iq{type = result, sub_el = []}. |