Added several integration tests for new contact list.

qa/integration/integration.rb

@@ -0,0 +1,3 @@
+VENDOR_DIR  = File.dirname(__FILE__) + "/../../../psi-qa"
+PROSODY_DIR = "#{VENDOR_DIR}/prosody-0.5.2/prosody"
+SQUISH_DIR  = "#{VENDOR_DIR}/squish-3.4.5-qt46x-maci386-gcc4.0"

qa/integration/prosody/data/localhost/accounts/user01.dat

@@ -0,0 +1,3 @@
+return {
+	["password"] = "user01",
+}

qa/integration/prosody/data/localhost/accounts/user02.dat

@@ -0,0 +1,3 @@
+return {
+	["password"] = "user02",
+}

qa/integration/prosody/data/localhost/accounts/user03.dat

@@ -0,0 +1,3 @@
+return {
+	["password"] = "user03",
+}

qa/integration/prosody/data/localhost/accounts/user04.dat

@@ -0,0 +1,3 @@
+return {
+	["password"] = "user05",
+}

qa/integration/prosody/data/localhost/accounts/user05.dat

@@ -0,0 +1,3 @@
+return {
+	["password"] = "user05",
+}

qa/integration/prosody/data/localhost/roster/user01.dat

@@ -0,0 +1,31 @@
+return {
+	[false] = {
+		["version"] = 10,
+	},
+	["user04@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user04",
+	},
+	["user03@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user03",
+	},
+	["pending"] = {
+	},
+	["user02@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user02",
+	},
+	["user05@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user05",
+	},
+}

qa/integration/prosody/data/localhost/roster/user02.dat

@@ -0,0 +1,31 @@
+return {
+	[false] = {
+		["version"] = 8,
+	},
+	["user04@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user04",
+	},
+	["user01@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user01",
+	},
+	["user03@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user03",
+	},
+	["pending"] = {
+	},
+	["user05@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user05",
+	},
+}

qa/integration/prosody/data/localhost/roster/user03.dat

@@ -0,0 +1,31 @@
+return {
+	[false] = {
+		["version"] = 7,
+	},
+	["user04@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user04",
+	},
+	["user01@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user01",
+	},
+	["user02@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user02",
+	},
+	["pending"] = {
+	},
+	["user05@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user05",
+	},
+}

qa/integration/prosody/data/localhost/roster/user04.dat

@@ -0,0 +1,31 @@
+return {
+	[false] = {
+		["version"] = 6,
+	},
+	["user01@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user01",
+	},
+	["user03@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user03",
+	},
+	["user02@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user02",
+	},
+	["pending"] = {
+	},
+	["user05@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user05",
+	},
+}

qa/integration/prosody/data/localhost/roster/user05.dat

@@ -0,0 +1,31 @@
+return {
+	[false] = {
+		["version"] = 5,
+	},
+	["user04@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user04",
+	},
+	["user01@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user01",
+	},
+	["user03@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user03",
+	},
+	["user02@localhost"] = {
+		["subscription"] = "both",
+		["groups"] = {
+		},
+		["name"] = "user02",
+	},
+	["pending"] = {
+	},
+}

qa/integration/prosody/data/localhost/vcard/user01.dat

@@ -0,0 +1,15 @@
+return {
+	[1] = "\n",
+	[2] = {
+		[1] = "user01",
+		["attr"] = {
+			["xmlns"] = "vcard-temp",
+		},
+		["name"] = "NICKNAME",
+	},
+	[3] = "\n",
+	["attr"] = {
+		["xmlns"] = "vcard-temp",
+	},
+	["name"] = "vCard",
+}

qa/integration/prosody/data/localhost/vcard/user02.dat

@@ -0,0 +1,15 @@
+return {
+	[1] = "\n",
+	[2] = {
+		[1] = "user02",
+		["attr"] = {
+			["xmlns"] = "vcard-temp",
+		},
+		["name"] = "NICKNAME",
+	},
+	[3] = "\n",
+	["attr"] = {
+		["xmlns"] = "vcard-temp",
+	},
+	["name"] = "vCard",
+}

qa/integration/prosody/data/localhost/vcard/user03.dat

@@ -0,0 +1,15 @@
+return {
+	[1] = "\n",
+	[2] = {
+		[1] = "user03",
+		["attr"] = {
+			["xmlns"] = "vcard-temp",
+		},
+		["name"] = "NICKNAME",
+	},
+	[3] = "\n",
+	["attr"] = {
+		["xmlns"] = "vcard-temp",
+	},
+	["name"] = "vCard",
+}

qa/integration/prosody/data/localhost/vcard/user04.dat

@@ -0,0 +1,15 @@
+return {
+	[1] = "\n",
+	[2] = {
+		[1] = "user04",
+		["attr"] = {
+			["xmlns"] = "vcard-temp",
+		},
+		["name"] = "NICKNAME",
+	},
+	[3] = "\n",
+	["attr"] = {
+		["xmlns"] = "vcard-temp",
+	},
+	["name"] = "vCard",
+}

qa/integration/prosody/data/localhost/vcard/user05.dat

@@ -0,0 +1,15 @@
+return {
+	[1] = "\n",
+	[2] = {
+		[1] = "user05",
+		["attr"] = {
+			["xmlns"] = "vcard-temp",
+		},
+		["name"] = "NICKNAME",
+	},
+	[3] = "\n",
+	["attr"] = {
+		["xmlns"] = "vcard-temp",
+	},
+	["name"] = "vCard",
+}

qa/integration/prosody/prosody.cfg.lua

@@ -0,0 +1,110 @@
+-- Prosody Example Configuration File
+--
+-- If it wasn't already obvious, -- starts a comment, and all
+-- text after it on a line is ignored by Prosody.
+--
+-- The config is split into sections, a global section, and one
+-- for each defined host that we serve. You can add as many host
+-- sections as you like.
+--
+-- Lists are written { "like", "this", "one" }
+-- Lists can also be of { 1, 2, 3 } numbers, and other things.
+-- Either commas, or semi-colons; may be used
+-- as seperators.
+--
+-- A table is a list of values, except each value has a name. An
+-- example table would be:
+--
+-- ssl = { key = "keyfile.key", certificate = "certificate.cert" }
+--
+-- Whitespace (that is tabs, spaces, line breaks) is mostly insignificant, so
+-- can
+-- be placed anywhere that 	you deem fitting.
+--
+-- Tip: You can check that the syntax of this file is correct when you have finished
+-- by running: luac -p prosody.cfg.lua
+-- If there are any errors, it will let you know what and where they are, otherwise it
+-- will keep quiet.
+--
+-- The only thing left to do is rename this file to remove the .dist ending, and fill in the
+-- blanks. Good luck, and happy Jabbering!
+
+-- Server-wide settings go in this section
+Host "*"
+
+	-- This is a (by default, empty) list of accounts that are admins
+	-- for the server. Note that you must create the accounts separately
+	-- (see http://prosody.im/doc/creating_accounts for info)
+	-- Example: admins = { "user1@example.com", "user2@example.net" }
+	admins = { }
+
+	-- This is the list of modules Prosody will load on startup.
+	-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
+	modules_enabled = {
+			-- Generally required
+				"roster"; -- Allow users to have a roster. Recommended ;)
+				"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
+				"tls"; -- Add support for secure TLS on c2s/s2s connections
+				"dialback"; -- s2s dialback support
+			  	"disco"; -- Service discovery
+
+			-- Not essential, but recommended
+				"private"; -- Private XML storage (for room bookmarks, etc.)
+				"vcard"; -- Allow users to set vCards
+
+			-- Nice to have
+				"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+				"version"; -- Replies to server version requests
+			  	"uptime"; -- Report how long server has been running
+			  	"time"; -- Let others know the time here on this server
+			  	"ping"; -- Replies to XMPP pings with pongs
+			  	"pep"; -- Enables users to publish their mood, activity, playing music and more
+				"register"; -- Allow users to register on this server using a client and change passwords
+
+			-- Other specific functionality
+				--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+			  	--"console"; -- telnet to port 5582 (needs console_enabled = true)
+				--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+				--"httpserver"; -- Serve static files from a directory over HTTP
+			  };
+
+	-- These modules are auto-loaded, should you
+	-- for (for some mad reason) want to disable
+	-- them then uncomment them below
+	modules_disabled = {
+			-- "presence";
+			-- "message";
+			-- "iq";
+	};
+
+	-- Disable account creation by default, for security
+	-- For more information see http://prosody.im/doc/creating_accounts
+	allow_registration = true;
+
+	-- These are the SSL/TLS-related settings. If you don't want
+	-- to use SSL/TLS, you may comment or remove this
+	ssl = {
+		key = "certs/localhost.key";
+		certificate = "certs/localhost.cert";
+		}
+
+-- This allows clients to connect to localhost. No harm in it.
+Host "localhost"
+
+-- Section for example.com
+-- (replace example.com with your domain name)
+Host "example.com"
+
+	enabled = false -- This will disable the host, preserving the config, but denying connections
+
+	-- Assign this host a certificate for TLS, otherwise it would use the one
+	-- set in the global section (if any).
+	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
+	-- use the global one.
+	ssl = {
+		key = "certs/example.com.key";
+		certificate = "certs/example.com.crt";
+		}
+
+-- Set up a MUC (multi-user chat) room server on conference.example.com:
+Component "conference.example.com" "muc"