10 files changed, 408 insertions, 50 deletions
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp
index 3b8734e..38f70db 100644
--- a/Swiften/QA/ClientTest/ClientTest.cpp
+++ b/Swiften/QA/ClientTest/ClientTest.cpp
@@ -19,18 +19,18 @@
 using namespace Swift;
 
-SimpleEventLoop eventLoop;
-BoostNetworkFactories networkFactories(&eventLoop);
+static SimpleEventLoop eventLoop;
+static BoostNetworkFactories networkFactories(&eventLoop);
 
-Client* client = 0;
-bool rosterReceived = false;
+static Client* client = 0;
+static bool rosterReceived = false;
 enum TestStage {
 	FirstConnect,
 	Reconnect
 };
-TestStage stage;
-ClientOptions options;
+static TestStage stage;
+static ClientOptions options;
 
-void handleDisconnected(boost::optional<ClientError> e) {
-	std::cout << "Disconnected: " << e << std::endl;
+static void handleDisconnected(boost::optional<ClientError> e) {
+	std::cout << "Disconnected: " << (e ? e.get().getType() : ClientError::UnknownError) << std::endl;
 	if (stage == FirstConnect) {
 		stage = Reconnect;
@@ -42,5 +42,5 @@ void handleDisconnected(boost::optional<ClientError> e) {
 }
 
-void handleRosterReceived(boost::shared_ptr<Payload>) {
+static void handleRosterReceived(boost::shared_ptr<Payload>) {
 	rosterReceived = true;
 	std::cout << "Disconnecting" << std::endl;
@@ -48,5 +48,5 @@ void handleRosterReceived(boost::shared_ptr<Payload>) {
 }
 
-void handleConnected() {
+static void handleConnected() {
 	std::cout << "Connected" << std::endl;
 	rosterReceived = false;
@@ -78,5 +78,5 @@ int main(int, char**) {
 
 	client = new Swift::Client(JID(jid), std::string(pass), &networkFactories);
-	ClientXMLTracer* tracer = new ClientXMLTracer(client, !options.boshURL.empty());
+	ClientXMLTracer* tracer = new ClientXMLTracer(client, !options.boshURL.isEmpty());
 	client->onConnected.connect(&handleConnected);
 	client->onDisconnected.connect(boost::bind(&handleDisconnected, _1));
diff --git a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
index 335f2d2..53faff7 100644
--- a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
+++ b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -19,5 +19,5 @@
 #include <Swiften/EventLoop/DummyEventLoop.h>
 
-const unsigned char* address = reinterpret_cast<const unsigned char*>("\x41\x63\xde\x89");
+static const unsigned char* address = reinterpret_cast<const unsigned char*>("\x4A\x32\x3e\x31");
 
 using namespace Swift;
@@ -71,5 +71,5 @@ class BoostConnectionTest : public CppUnit::TestFixture {
 			testling->onDataRead.connect(boost::bind(&BoostConnectionTest::handleDataRead, this, _1));
 			testling->onDisconnected.connect(boost::bind(&BoostConnectionTest::handleDisconnected, this));
-			testling->connect(HostAddressPort(HostAddress("65.99.222.137"), 5222));
+			testling->connect(HostAddressPort(HostAddress("74.50.62.49"), 5222));
 			while (receivedData.empty()) {
 				Swift::sleep(10);
@@ -98,5 +98,5 @@ class BoostConnectionTest : public CppUnit::TestFixture {
 			testling->onDataRead.connect(boost::bind(&BoostConnectionTest::handleDataRead, this, _1));
 			testling->onDisconnected.connect(boost::bind(&BoostConnectionTest::handleDisconnected, this));
-			testling->connect(HostAddressPort(HostAddress("65.99.222.137"), 5222));
+			testling->connect(HostAddressPort(HostAddress("74.50.62.49"), 5222));
 			while (!connectFinished) {
 				boostIOService->run_one();
diff --git a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
index 7cb9ed3..dcd2be8 100644
--- a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
+++ b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
@@ -10,12 +10,20 @@
 
 #include <algorithm>
-
 #include <Swiften/Base/sleep.h>
 #include <string>
 #include <Swiften/Base/ByteArray.h>
+#ifdef USE_UNBOUND
+#include <Swiften/Network/UnboundDomainNameResolver.h>
+#else
 #include <Swiften/Network/PlatformDomainNameResolver.h>
+#endif
+#include <Swiften/Network/BoostTimerFactory.h>
+#include <Swiften/Network/NetworkFactories.h>
+#include <Swiften/Network/BoostIOServiceThread.h>
 #include <Swiften/Network/DomainNameAddressQuery.h>
 #include <Swiften/Network/DomainNameServiceQuery.h>
 #include <Swiften/EventLoop/DummyEventLoop.h>
+#include <Swiften/IDN/IDNConverter.h>
+#include <Swiften/IDN/PlatformIDNConverter.h>
 
 using namespace Swift;
@@ -31,10 +39,14 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testResolveAddress);
 		CPPUNIT_TEST(testResolveAddress_Error);
+#ifndef USE_UNBOUND
 		CPPUNIT_TEST(testResolveAddress_IPv6);
 		CPPUNIT_TEST(testResolveAddress_IPv4and6);
 		CPPUNIT_TEST(testResolveAddress_International);
+#endif
 		CPPUNIT_TEST(testResolveAddress_Localhost);
 		CPPUNIT_TEST(testResolveAddress_Parallel);
+#ifndef USE_UNBOUND
 		CPPUNIT_TEST(testResolveService);
+#endif
 		CPPUNIT_TEST(testResolveService_Error);
 		CPPUNIT_TEST_SUITE_END();
@@ -42,10 +54,17 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
 	public:
 		void setUp() {
+			ioServiceThread = new BoostIOServiceThread();
 			eventLoop = new DummyEventLoop();
-			resolver = new PlatformDomainNameResolver(eventLoop);
+			idnConverter = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
+#ifdef USE_UNBOUND
+			resolver = new UnboundDomainNameResolver(idnConverter.get(), ioServiceThread->getIOService(), eventLoop);
+#else
+			resolver = new PlatformDomainNameResolver(idnConverter.get(), eventLoop);
+#endif
 			resultsAvailable = false;
 		}
 
 		void tearDown() {
+			delete ioServiceThread;
 			delete resolver;
 			delete eventLoop;
@@ -142,5 +161,5 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
 
 		void testResolveService() {
-			boost::shared_ptr<DomainNameServiceQuery> query(createServiceQuery("_xmpp-client._tcp.xmpp-srv.test.swift.im"));
+			boost::shared_ptr<DomainNameServiceQuery> query(createServiceQuery("_xmpp-client._tcp.", "xmpp-srv.test.swift.im"));
 
 			query->run();
@@ -184,6 +203,6 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
 			}
 
-			boost::shared_ptr<DomainNameServiceQuery> createServiceQuery(const std::string& domain) {
-				boost::shared_ptr<DomainNameServiceQuery> result = resolver->createServiceQuery(domain);
+			boost::shared_ptr<DomainNameServiceQuery> createServiceQuery(const std::string& serviceLookupPrefix, const std::string& domain) {
+				boost::shared_ptr<DomainNameServiceQuery> result = resolver->createServiceQuery(serviceLookupPrefix, domain);
 				result->onResult.connect(boost::bind(&DomainNameResolverTest::handleServiceQueryResult, this, _1));
 				return result;
@@ -209,5 +228,8 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
 
 	private:
+		BoostIOServiceThread* ioServiceThread;
 		DummyEventLoop* eventLoop;
+		boost::shared_ptr<IDNConverter> idnConverter;
+		boost::shared_ptr<TimerFactory> timerFactory;
 		bool resultsAvailable;
 		std::vector<HostAddress> addressQueryResult;
@@ -215,5 +237,5 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
 		boost::optional<DomainNameResolveError> addressQueryError;
 		std::vector<DomainNameServiceQuery::Result> serviceQueryResult;
-		PlatformDomainNameResolver* resolver;
+		DomainNameResolver* resolver;
 };
 
diff --git a/Swiften/QA/NetworkTest/SConscript b/Swiften/QA/NetworkTest/SConscript
index f9308f6..b090165 100644
--- a/Swiften/QA/NetworkTest/SConscript
+++ b/Swiften/QA/NetworkTest/SConscript
@@ -9,8 +9,9 @@ if env["TEST"] :
 	myenv.MergeFlags(myenv["CHECKER_FLAGS"])
 	myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+	myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
 	myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
-	myenv.MergeFlags(myenv["BOOST_FLAGS"])
-	myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
-	myenv.MergeFlags(env["PLATFORM_FLAGS"])
+
+	if env.get("unbound", False) :
+		myenv.Append(CPPDEFINES = ["USE_UNBOUND"])
 
 	tester = myenv.Program("NetworkTest", [
diff --git a/Swiften/QA/ScriptedTests/MultipleClients.lua b/Swiften/QA/ScriptedTests/MultipleClients.lua
index ce51481..ddc7c44 100644
--- a/Swiften/QA/ScriptedTests/MultipleClients.lua
+++ b/Swiften/QA/ScriptedTests/MultipleClients.lua
@@ -1,4 +1,4 @@
 --
--- Copyright (c) 2010 Remko Tronçon
+-- Copyright (c) 2010-2013 Remko Tronçon
 -- Licensed under the GNU General Public License v3.
 -- See Documentation/Licenses/GPLv3.txt for more information.
@@ -17,9 +17,9 @@ for i = 1, num_clients do
 	client:set_options({compress = false})
 	client:async_connect()
-	table.insert(clients, client)
+	clients[#clients+1] = client
 end
 
 print("Waiting for clients to be connected")
-for i, client in ipairs(clients) do
+for _, client in ipairs(clients) do
 	client:wait_connected()
 	client:send_presence("Hello")
@@ -27,5 +27,5 @@ end
 
 print("Disconnecting clients")
-for i, client in ipairs(clients) do
+for _, client in ipairs(clients) do
 	client:disconnect()
 end
diff --git a/Swiften/QA/ScriptedTests/PubSub.lua b/Swiften/QA/ScriptedTests/PubSub.lua
new file mode 100644
index 0000000..43cce14
--- /dev/null
+++ b/Swiften/QA/ScriptedTests/PubSub.lua
@@ -0,0 +1,340 @@
+ --[[
+	Copyright (c) 2013 Remko Tronçon
+	Licensed under the GNU General Public License.
+	See the COPYING file for more information.
+--]]
+
+require 'sluift'
+
+sluift.debug = os.getenv("SLUIFT_DEBUG")
+
+local publisher
+local publisher_jid = os.getenv("SLUIFT_JID")
+local pubsub_jid = os.getenv("SLUIFT_PUBSUB_SERVICE") or sluift.jid.to_bare(publisher_jid)
+local pubsub
+local node_id = os.getenv("SLUIFT_PUBSUB_NODE") or "http://swift.im/Swiften/QA/PubSub"
+local node
+
+local subscriber
+local subscriber_jid = os.getenv("SLUIFT_JID2")
+local subscriber_pubsub
+local subscriber_node
+
+local publish_item = {id = 'item_id', data = {{ _type = 'software_version', name = 'MyTest', os = 'Lua' }} }
+local publish_item2 = {id = 'item_id2', data = {{ _type = 'software_version', name = 'MyTest2', os = 'Lua' }} }
+local publish_item3 = {id = 'item_id3', data = {{ _type = 'software_version', name = 'MyTest3', os = 'Lua' }} }
+
+--------------------------------------------------------------------------------
+-- Helper methods
+--------------------------------------------------------------------------------
+
+function purge_pubsub_events(client)
+	client:for_each_pubsub_event({timeout = 2000}, function() end)
+end
+
+--------------------------------------------------------------------------------
+-- 5. Entity use cases
+--------------------------------------------------------------------------------
+function test_entity_use_cases() 
+	node:delete()
+
+	-- 5.2 List nodes
+	assert(node:create())
+	local nodes = assert(pubsub:list_nodes()).items
+	local found_item = false
+	for _, node in ipairs(nodes) do
+		if node.node == node_id then found_item = true end
+	end
+	assert(found_item)
+	assert(node:delete())
+
+
+	-- 5.5 Discover items of node
+	assert(node:create())
+	assert(node:publish {items = {publish_item}})
+	local items = assert(node:list_items()).items
+	assert(#items == 1)
+	assert(items[1].name == 'item_id')
+	assert(node:delete())
+
+	-- 5.6 Subscriptions
+	assert(node:create())
+	assert(subscriber_node:subscribe({ jid = subscriber_jid }))
+	local service_subscriptions = assert(subscriber_pubsub:get_subscriptions())
+	assert(#service_subscriptions == 1)
+	assert(service_subscriptions[1].node == node_id)
+	assert(service_subscriptions[1].jid == subscriber_jid)
+	assert(service_subscriptions[1].subscription == 'subscribed')
+	local node_subscriptions = assert(subscriber_node:get_subscriptions())
+	assert(#node_subscriptions == 1)
+	assert(node_subscriptions[1].jid == subscriber_jid)
+	assert(node_subscriptions[1].subscription == 'subscribed')
+	assert(node:delete())
+
+	-- 5.7 Retrieve affiliations
+	--print(pubsub:get_affiliations()) -- Freezes Isode
+	--print(node:get_affiliations()) -- Freezes isode
+end
+
+--------------------------------------------------------------------------------
+-- 6. Subscriber use cases
+--------------------------------------------------------------------------------
+
+function test_subscriber_use_cases()
+	node:delete()
+
+	-- 6.1 Subscribe to a node
+	assert(node:create())
+	local subscription = assert(subscriber_node:subscribe({ jid = subscriber_jid }))
+	-- TODO: Test subscription id etc. Doesn't work with M-link atm
+	-- TODO: Test pending subscription
+	-- TODO: Test configuration required
+	assert(node:delete())
+
+	-- 6.2 Unsubscribe from a node
+	assert(node:create())
+	assert(subscriber_node:subscribe({ jid = subscriber_jid }))
+	assert(subscriber_node:unsubscribe({ jid = subscriber_jid }))
+	assert(node:delete())
+
+	-- 6.3 Configure subscription options
+	-- TODO: Not supported by M-Link? Finish it later
+	--assert(node:create())	
+	--assert(subscriber_node:subscribe({ jid = subscriber_jid }))
+	--local options = assert(subscriber_node:get_subscription_options({ jid = subscriber_jid }))
+	--print(options)
+	--assert(node:delete())
+
+	-- 6.4 Request default subscription configuration options
+	-- TODO: Not supported by M-Link? Finish it later
+	--local options = assert(subscriber_pubsub:get_default_subscription_options())
+	--print(options)
+	--local options = assert(subscriber_node:get_default_subscription_options())
+	--print(options)
+	
+	-- 6.5 Retrieve items of a node
+	assert(node:create())
+	assert(node:set_configuration{configuration = {['pubsub#max_items'] = '10'}})
+	assert(node:publish{item = publish_item})
+	assert(node:publish{item = publish_item2})
+	local items = assert(subscriber_node:get_items())
+	assert(#items == 2)
+	assert(items[1].id == 'item_id')
+	assert(items[1].data[1].name == 'MyTest')
+	assert(items[2].id == 'item_id2')
+	assert(items[2].data[1].name == 'MyTest2')
+	assert(node:delete())
+
+	-- 6.5.7 Requesting most recent items
+	assert(node:create())
+	assert(node:set_configuration{configuration = {['pubsub#max_items'] = '10'}})
+	assert(node:publish{item = publish_item})
+	assert(node:publish{item = publish_item2})
+	assert(node:publish{item = publish_item3})
+	local items = assert(subscriber_node:get_items{maximum_items = 2})
+	assert(#items == 2)
+	assert(items[1].id == 'item_id2')
+	assert(items[1].data[1].name == 'MyTest2')
+	assert(items[2].id == 'item_id3')
+	assert(items[2].data[1].name == 'MyTest3')
+	assert(node:delete())
+	
+	-- 6.5.8 requesting specific item
+	assert(node:create())
+	assert(node:set_configuration{configuration = {['pubsub#max_items'] = '10'}})
+	assert(node:publish{item = publish_item})
+	assert(node:publish{item = publish_item2})
+	local items = assert(subscriber_node:get_item{id = 'item_id2'})
+	assert(#items == 1)
+	assert(items[1].id == 'item_id2')
+	assert(items[1].data[1].name == 'MyTest2')
+	assert(node:delete())
+end
+
+--------------------------------------------------------------------------------
+-- 7. Publisher use cases
+--------------------------------------------------------------------------------
+
+function test_publisher_use_cases()
+	node:delete()
+
+	-- 7.1 Publish item to a node
+	assert(node:create())
+	assert(subscriber_node:subscribe({ jid = subscriber_jid }))
+	purge_pubsub_events(subscriber)
+	assert(node:publish {items = {publish_item}})
+	local event = assert(subscriber:get_next_event { type = 'pubsub' })
+	assert(event.from == publisher_jid)
+	assert(event._type == 'pubsub_event_items')
+	assert(event.items[1].id == publish_item.id)
+	assert(event.items[1].data[1].os == publish_item.data[1].os)
+	assert(event.item.os == publish_item.data[1].os)
+	assert(node:delete())
+
+	-- 7.2 Delete item from a node
+	assert(node:create())
+	assert(subscriber_node:subscribe({ jid = subscriber_jid }))
+	assert(node:publish {items = {publish_item}})
+	assert(node:retract { id = 'item_id', notify = true })
+	assert(node:delete())
+
+	-- 7.2.2.1 Delete and notify
+	assert(node:create())
+	assert(subscriber_node:subscribe({ jid = subscriber_jid }))
+	assert(node:publish {items = {publish_item}})
+	purge_pubsub_events(subscriber)
+	assert(node:retract { id = 'item_id', notify = true })
+	local event = assert(subscriber:get_next_event { type = 'pubsub' })
+	assert(event._type == 'pubsub_event_items')
+	assert(event.retracts[1].id == 'item_id')
+	assert(node:delete())
+
+	-- Publish an unknown element type
+	atom = [[
+		<entry xmlns='http://www.w3.org/2005/Atom'>
+			<title>Down the Rabbit Hole</title>
+			<summary>
+				Alice was beginning to get very tired of sitting by her sister on the
+				bank and of having nothing to do: once or twice she had peeped into the
+				book her sister was reading, but it had no pictures or conversations in
+				it, "and what is the use of a book," thought Alice, "without pictures
+				or conversations?'
+			</summary>
+			<link rel='alternate' type='text/html' 
+				href='http://www.gutenberg.org/files/11/11-h/11-h.htm#link2HCH0001'/>
+			<id>tag:gutenberg.org,2008:entry-1234</id>
+			<published>2008-06-25T18:30:02Z</published>
+			<updated>2008-06-25T18:30:02Z</updated>
+		</entry>
+	]]
+	assert(node:create())
+	assert(subscriber_node:subscribe({ jid = subscriber_jid }))
+	purge_pubsub_events(subscriber)
+	assert(node:publish { item = atom })
+	local event_item = assert(subscriber:get_next_event { type = 'pubsub' }).item
+	assert(event_item._type == 'dom')
+	assert(event_item.ns == 'http://www.w3.org/2005/Atom')
+	assert(event_item.tag == 'entry')
+	assert(node:delete())
+end
+
+--------------------------------------------------------------------------------
+-- 8 Owner Use Cases
+--------------------------------------------------------------------------------
+
+function test_owner_use_cases()
+	node:delete()
+
+	-- 8.1 Create a node
+	--   Create node with default config
+	assert(node:create())
+	configuration = assert(node:get_configuration())['data']
+	assert(node:delete())
+
+	--   Create node with custom config
+	print("Creating with configuration")
+	assert(node:create { configuration = { ['pubsub#access_model'] = 'whitelist' } })
+	configuration = assert(node:get_configuration())['data']
+	assert(configuration['pubsub#access_model']['value'] == 'whitelist')
+	assert(node:delete())
+
+	-- 8.2 Configure node
+	--   Set configuration
+	assert(node:create())
+	assert(node:set_configuration {configuration = {['pubsub#access_model'] = 'whitelist'}})
+	configuration = assert(node:get_configuration())['data']
+	assert(configuration['pubsub#access_model']['value'] == 'whitelist')
+	assert(node:delete())
+
+	-- Untested: 8.2.5.3 Success With Notifications
+	
+	-- 8.3 Request Default Node Configuration Options
+	configuration = assert(pubsub:get_default_configuration())['data']
+	assert(configuration['pubsub#access_model'] ~= nil)
+
+	-- 8.4 Delete node
+	--   Without redirection (see above)
+	--   With redirection
+	assert(node:create())
+	assert(subscriber_node:subscribe({ jid = subscriber_jid }))
+	purge_pubsub_events(subscriber)
+	assert(node:delete {redirect = 'foo@bar.com'})
+	-- FIXME: M-Link doesn't send out an event. Test this later.
+	--local event = assert(subscriber:get_next_event { type = 'pubsub' })
+	--print(event)
+	--assert(event._type == 'pubsub_event_items')
+	--assert(event.retracts[1].id == 'item_id')
+	
+	-- 8.5 Purge node items
+	assert(node:create())
+	assert(subscriber_node:subscribe({ jid = subscriber_jid }))
+	-- Publishing multiple items doesn't seem to work in M-Link
+	--assert(node:publish {items = { publish_item, publish_item2 }})
+	assert(node:publish {items = {publish_item} })
+	assert(node:publish {items = {publish_item2} })
+	purge_pubsub_events(subscriber)
+	if node:purge() then
+		-- Hasn't worked yet. Add more to this test later (including notifications)
+	else 
+		print("Warning: Purge not supported. Skipping test")
+	end
+	assert(node:delete())
+	
+	-- 8.6 Manage subscription requests
+	-- TODO	
+
+	-- 8.7 Process pending subscription requests
+	-- TODO
+	
+	-- 8.8 Manage Subscriptions
+	assert(node:create())
+	assert(subscriber_node:subscribe({ jid = subscriber_jid }))
+	local items = assert(node:get_owner_subscriptions())
+	assert(#items == 1)
+	assert(items[1].jid == subscriber_jid)
+	assert(items[1].subscription == "subscribed")
+	assert(node:delete())
+ 
+	-- 8.9 Manage Affiliations
+	assert(node:create())
+	assert(node:set_owner_affiliations{affiliations = {{jid = subscriber_jid, type = 'publisher'}}})
+	local items = assert(node:get_owner_affiliations())
+	assert(#items == 2)
+	assert(items[1].jid == publisher_jid)
+	assert(items[1].type == "owner")
+	assert(items[2].jid == subscriber_jid)
+	assert(items[2].type == "publisher")
+	assert(node:delete())
+end
+
+function run_tests() 
+	connect_options = {}
+
+	-- Set up publisher & subscriber
+	publisher = sluift.new_client(publisher_jid, os.getenv("SLUIFT_PASS"))
+	assert(publisher:connect(connect_options))
+	subscriber = sluift.new_client(subscriber_jid, os.getenv("SLUIFT_PASS2"))
+	assert(subscriber:connect(connect_options))
+
+	pubsub = publisher:pubsub(pubsub_jid)
+	node = pubsub:node(node_id)
+
+	subscriber_pubsub = subscriber:pubsub(pubsub_jid)
+	subscriber_node = subscriber_pubsub:node(node_id)
+
+	-- The tests
+	test_entity_use_cases()
+	test_subscriber_use_cases()
+	test_publisher_use_cases()
+	test_owner_use_cases()
+end
+
+success, err = pcall(run_tests)
+
+if subscriber then subscriber:disconnect() end
+if publisher then publisher:disconnect() end
+
+if not success then
+	print(err)
+	os.exit(-1)
+end
diff --git a/Swiften/QA/ScriptedTests/SendMessage.lua b/Swiften/QA/ScriptedTests/SendMessage.lua
index 8c54d00..9623ef4 100644
--- a/Swiften/QA/ScriptedTests/SendMessage.lua
+++ b/Swiften/QA/ScriptedTests/SendMessage.lua
@@ -1,4 +1,4 @@
 --
--- Copyright (c) 2010 Remko Tronçon
+-- Copyright (c) 2010-2013 Remko Tronçon
 -- Licensed under the GNU General Public License v3.
 -- See Documentation/Licenses/GPLv3.txt for more information.
@@ -24,5 +24,5 @@ client2:send_presence("I'm here")
 print "Checking version of client 2 from client 1"
 client2:set_version({name = "Sluift Test", version = "1.0"})
-client2_version = client1:get_version(client2_jid)
+client2_version = client1:get_software_version {to=client2_jid}
 assert(client2_version["name"] == "Sluift Test")
 assert(client2_version["version"] == "1.0")
@@ -30,14 +30,14 @@ assert(client2_version["version"] == "1.0")
 print "Sending message from client 1 to client 2"
 client1:send_message(client2_jid, "Hello")
-received_message = client2:for_event(function(event) 
-		if event["type"] == "message" and event["from"] == client1_jid then
-			return event["body"]
+received_message = client2:for_each_message({timeout = 1000}, function(message) 
+	if message["from"] == client1_jid then
+		return message["body"]
 	end
-	end, 10000)
+end)
 assert(received_message == "Hello")
 
 print "Retrieving the roster"
 roster = client1:get_roster()
-tprint(roster)
+sluift.tprint(roster)
 
 client1:disconnect()
diff --git a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
index 7667176..4145696 100644
--- a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
+++ b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
@@ -50,5 +50,5 @@ class VCardFileStorageTest : public CppUnit::TestFixture {
 			CPPUNIT_ASSERT(boost::filesystem::exists(vcardFile));
 			ByteArray data;
-			data.readFromFile(vcardFile.string());
+			data.readFromFile(vcardFile);
 			CPPUNIT_ASSERT(boost::starts_with(data.toString(), "<vCard xmlns=\"vcard-temp\">"));
 		}
diff --git a/Swiften/QA/TLSTest/CertificateTest.cpp b/Swiften/QA/TLSTest/CertificateTest.cpp
index 6932881..2089732 100644
--- a/Swiften/QA/TLSTest/CertificateTest.cpp
+++ b/Swiften/QA/TLSTest/CertificateTest.cpp
@@ -33,5 +33,5 @@ class CertificateTest : public CppUnit::TestFixture {
 		void setUp() {
 			pathProvider = new PlatformApplicationPathProvider("FileReadBytestreamTest");
-			readByteArrayFromFile(certificateData, (pathProvider->getExecutableDir() / "jabber_org.crt").string());
+			readByteArrayFromFile(certificateData, (pathProvider->getExecutableDir() / "jabber_org.crt"));
 			certificateFactory = new CERTIFICATE_FACTORY();
 		}
@@ -43,5 +43,5 @@ class CertificateTest : public CppUnit::TestFixture {
 
 		void testConstructFromDER() {
-			Certificate::ref testling = certificateFactory->createCertificateFromDER(certificateData);
+			Certificate::ref testling = Certificate::ref(certificateFactory->createCertificateFromDER(certificateData));
 
 			CPPUNIT_ASSERT_EQUAL(std::string("*.jabber.org"), testling->getCommonNames()[0]);
@@ -49,5 +49,5 @@ class CertificateTest : public CppUnit::TestFixture {
 		
 		void testToDER() {
-			Certificate::ref testling = certificateFactory->createCertificateFromDER(certificateData);
+			Certificate::ref testling = Certificate::ref(certificateFactory->createCertificateFromDER(certificateData));
 
 			CPPUNIT_ASSERT_EQUAL(certificateData, testling->toDER());
@@ -56,5 +56,5 @@ class CertificateTest : public CppUnit::TestFixture {
 /*
 		void testGetSubjectName() {
-			Certificate::ref testling = certificateFactory->createCertificateFromDER(certificateData);
+			Certificate::ref testling = Certificate::ref(certificateFactory->createCertificateFromDER(certificateData);
 
 			CPPUNIT_ASSERT_EQUAL(std::string("/description=114072-VMk8pdi1aj5kTXxO/C=US/ST=Colorado/L=Denver/O=Peter Saint-Andre/OU=StartCom Trusted Certificate Member/CN=*.jabber.org/emailAddress=hostmaster@jabber.org"), testling->getSubjectName());
@@ -63,5 +63,5 @@ class CertificateTest : public CppUnit::TestFixture {
 
 		void testGetCommonNames() {
-			Certificate::ref testling = certificateFactory->createCertificateFromDER(certificateData);
+			Certificate::ref testling = Certificate::ref(certificateFactory->createCertificateFromDER(certificateData));
 
 			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(testling->getCommonNames().size()));
@@ -70,5 +70,5 @@ class CertificateTest : public CppUnit::TestFixture {
 
 		void testGetSRVNames() {
-			Certificate::ref testling = certificateFactory->createCertificateFromDER(certificateData);
+			Certificate::ref testling = Certificate::ref(certificateFactory->createCertificateFromDER(certificateData));
 
 			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(testling->getSRVNames().size()));
@@ -77,5 +77,5 @@ class CertificateTest : public CppUnit::TestFixture {
 
 		void testGetDNSNames() {
-			Certificate::ref testling = certificateFactory->createCertificateFromDER(certificateData);
+			Certificate::ref testling = Certificate::ref(certificateFactory->createCertificateFromDER(certificateData));
 
 			CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(testling->getDNSNames().size()));
@@ -85,5 +85,5 @@ class CertificateTest : public CppUnit::TestFixture {
 
 		void testGetXMPPAddresses() {
-			Certificate::ref testling = certificateFactory->createCertificateFromDER(certificateData);
+			Certificate::ref testling = Certificate::ref(certificateFactory->createCertificateFromDER(certificateData));
 
 			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(testling->getXMPPAddresses().size()));
diff --git a/Swiften/QA/TLSTest/SConscript b/Swiften/QA/TLSTest/SConscript
index 14e2de0..18f6998 100644
--- a/Swiften/QA/TLSTest/SConscript
+++ b/Swiften/QA/TLSTest/SConscript
@@ -8,11 +8,6 @@ if env["TEST"] :
 	myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
 	myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+	myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
 	myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
-	myenv.MergeFlags(myenv["BOOST_FLAGS"])
-	myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
-	if myenv.get("HAVE_OPENSSL") :
-		myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
-		myenv.Append(CPPDEFINES = ["HAVE_OPENSSL"])
-	myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
 	
 	tester = myenv.Program("TLSTest", [