Merge 0.7->0.8

[prosody.git] / tests / test_util_jid.lua

diff --git a/tests/test_util_jid.lua b/tests/test_util_jid.lua
index e91585bd05b96ffa68ee9c728d838dcedbb7171d..a817e644c1a5d4e16ec6b33afb42ea7c5600928c 100644 (file)
--- a/tests/test_util_jid.lua
+++ b/tests/test_util_jid.lua
@@ -25,15 +25,21 @@ function split(split)
                assert_equal(expected_server, rserver, "split("..tostring(input_jid)..") failed");
                assert_equal(expected_resource, rresource, "split("..tostring(input_jid)..") failed");
        end
+
+       -- Valid JIDs
        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/resource",    "node", "server", "resource"        );
+       test("server",                  nil,    "server", nil               );
+       test("server/resource",         nil,    "server", "resource"        );
+       test("server/resource@foo",     nil,    "server", "resource@foo"    );
+       test("server/resource@foo/bar", nil,    "server", "resource@foo/bar");
 
-       test("node@/server", nil, nil, nil , nil );
-       test("@server",      nil, nil, nil , nil );
-       test("@server/resource",nil,nil,nil, nil );
+       -- Always invalid JIDs
+       test(nil,                nil, nil, nil);
+       test("node@/server",     nil, nil, nil);
+       test("@server",          nil, nil, nil);
+       test("@server/resource", nil, nil, nil);
+       test("@/resource", nil, nil, nil);
 end
 
 function bare(bare)