X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tests%2Ftest_util_jid.lua;h=a817e644c1a5d4e16ec6b33afb42ea7c5600928c;hb=c269396a37a8bef1b71982f2cdd336324eb72d07;hp=98c85f4aba05c209bd63a698736dcdc85bb5daae;hpb=576f6289905333eed4b8fc7b66c11b66292fe49e;p=prosody.git

diff --git a/tests/test_util_jid.lua b/tests/test_util_jid.lua
index 98c85f4a..a817e644 100644
--- a/tests/test_util_jid.lua
+++ b/tests/test_util_jid.lua
@@ -1,22 +1,21 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
--- 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.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
+function join(join)
+	assert_equal(join("a", "b", "c"), "a@b/c", "builds full JID");
+	assert_equal(join("a", "b", nil), "a@b", "builds bare JID");
+	assert_equal(join(nil, "b", "c"), "b/c", "builds full host JID");
+	assert_equal(join(nil, "b", nil), "b", "builds bare host JID");
+	assert_equal(join(nil, nil, nil), nil, "invalid JID is nil");
+	assert_equal(join("a", nil, nil), nil, "invalid JID is nil");
+	assert_equal(join(nil, nil, "c"), nil, "invalid JID is nil");
+	assert_equal(join("a", nil, "c"), nil, "invalid JID is nil");
+end
 
 
 function split(split)
@@ -26,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 +59,15 @@ function bare(bare)
 	assert_equal(bare("user@@host/resource"), nil, "invalid JID is nil");
 	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