X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tests%2Ftest_util_jid.lua;h=02a90c3ba983d612fe1d55a90774af1f4904876f;hb=7773a9f6f197af9ed28385ac44c16c4a44e3ad60;hp=5cc1390b6c96508c69cfea2f980a5862be853ea6;hpb=3813f633eebc075fc0cf3db4c7da4f24f49e5bc0;p=prosody.git

diff --git a/tests/test_util_jid.lua b/tests/test_util_jid.lua
index 5cc1390b..02a90c3b 100644
--- a/tests/test_util_jid.lua
+++ b/tests/test_util_jid.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -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)
@@ -54,3 +60,14 @@ function bare(bare)
 	assert_equal(bare("user@host/"), nil, "invalid JID is nil");
 end
 
+function compare(compare)
+	assert_equal(compare("host", "host"), true, "host should match");
+	assert_equal(compare("host", "other-host"), false, "host should not match");
+	assert_equal(compare("other-user@host/resource", "host"), true, "host should match");
+	assert_equal(compare("other-user@host", "user@host"), false, "user should not match");
+	assert_equal(compare("user@host", "host"), true, "host should match");
+	assert_equal(compare("user@host/resource", "host"), true, "host should match");
+	assert_equal(compare("user@host/resource", "user@host"), true, "user and host should match");
+	assert_equal(compare("user@other-host", "host"), false, "host should not match");
+	assert_equal(compare("user@other-host", "user@host"), false, "host should not match");
+end