Merge branch 'master' into xml-ng

Conflicts:
	src/adhoc.erl
	src/cyrsasl_oauth.erl
	src/ejabberd_c2s.erl
	src/ejabberd_config.erl
	src/ejabberd_service.erl
	src/gen_mod.erl
	src/mod_admin_extra.erl
	src/mod_announce.erl
	src/mod_carboncopy.erl
	src/mod_client_state.erl
	src/mod_configure.erl
	src/mod_echo.erl
	src/mod_mam.erl
	src/mod_muc.erl
	src/mod_muc_room.erl
	src/mod_offline.erl
	src/mod_pubsub.erl
	src/mod_stats.erl
	src/node_flat_sql.erl
	src/randoms.erl

1 files changed, 32 insertions, 0 deletions

diff --git a/test/elixir-config/validation_test.exs b/test/elixir-config/validation_test.exs
new file mode 100644
index 000000000..1df775966
--- /dev/null
+++ b/test/elixir-config/validation_test.exs
@@ -0,0 +1,32 @@
+defmodule Ejabberd.Config.ValidationTest do
+  use ExUnit.Case
+
+  alias Ejabberd.Config
+  alias Ejabberd.Config.Store
+  alias Ejabberd.Config.Validation
+
+  setup_all do
+    pid = Process.whereis(Ejabberd.Config.Store)
+    unless pid != nil and Process.alive?(pid) do
+      Store.start_link
+
+      File.cd("test/elixir-config/shared")
+      config_file_path = File.cwd! <> "/ejabberd_for_validation.exs"
+      Config.init(config_file_path)
+    end
+
+    {:ok, %{}}
+  end
+
+  test "validates correctly the modules" do
+    [mod_irc, mod_configure, mod_time] = Store.get(:modules)
+
+    [{:error, _mod, errors}] = Validation.validate(mod_configure)
+    assert %{dependency: [mod_adhoc: :not_found]} == errors
+
+    [{:error, _mod, errors}] = Validation.validate(mod_time)
+    assert %{attribute: [{{:attr_not_supported, true}, :attr_not_supported}]} == errors
+
+    [{:ok, _mod}] = Validation.validate(mod_irc)
+  end
+end