Automated merge.

[prosody.git] / tests / test_util_jid.lua

diff --git a/tests/test_util_jid.lua b/tests/test_util_jid.lua
index 3be0bfa1ba5b9f944e0eca4000ace5beb2953467..7a6160088d42417bb27866bb00205ca1462aa1da 100644 (file)
--- a/tests/test_util_jid.lua
+++ b/tests/test_util_jid.lua
@@ -1,13 +1,34 @@
 
 function split(split)
-       function test(jid, node, server, resource)
-               local rnode, rserver, rresource = split(jid);
-               assert_equal(node, rnode, "split("..jid..") failed");
-               assert_equal(server, rserver, "split("..jid..") failed");
-               assert_equal(resource, rresource, "split("..jid..") failed");
+       function test(input_jid, expected_node, expected_server, expected_resource)
+               local rnode, rserver, rresource = split(input_jid);
+               assert_equal(expected_node, rnode, "split("..tostring(input_jid)..") failed");
+               assert_equal(expected_server, rserver, "split("..tostring(input_jid)..") failed");
+               assert_equal(expected_resource, rresource, "split("..tostring(input_jid)..") failed");
        end
        test("node@server",             "node", "server", nil           );
        test("node@server/resource",    "node", "server", "resource"    );
        test("server",                  nil,    "server", nil           );
        test("server/resource",         nil,    "server", "resource"    );
+       test(nil,                       nil,    nil     , nil           );
+
+       test("node@/server", nil, nil, nil , nil );
+end
+
+function bare(bare)
+       assert_equal(bare("user@host"), "user@host", "bare JID remains bare");
+       assert_equal(bare("host"), "host", "Host JID remains host");
+       assert_equal(bare("host/resource"), "host", "Host JID with resource becomes host");
+       assert_equal(bare("user@host/resource"), "user@host", "user@host JID with resource becomes user@host");
+       assert_equal(bare("user@/resource"), nil, "invalid JID is nil");
+       assert_equal(bare("@/resource"), nil, "invalid JID is nil");
+       assert_equal(bare("@/"), nil, "invalid JID is nil");
+       assert_equal(bare("/"), nil, "invalid JID is nil");
+       assert_equal(bare(""), nil, "invalid JID is nil");
+       assert_equal(bare("@"), nil, "invalid JID is nil");
+       assert_equal(bare("user@"), nil, "invalid JID is nil");
+       assert_equal(bare("user@@"), nil, "invalid JID is nil");
+       assert_equal(bare("user@@host"), nil, "invalid JID is nil");
+       assert_equal(bare("user@@host/resource"), nil, "invalid JID is nil");
+       assert_equal(bare("user@host/"), nil, "invalid JID is nil");
 end