1 files changed, 13 insertions, 3 deletions
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp
index 4515893..3b8734e 100644
--- a/Swiften/QA/ClientTest/ClientTest.cpp
+++ b/Swiften/QA/ClientTest/ClientTest.cpp
@@ -1,88 +1,98 @@
 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <boost/bind.hpp>
 #include <boost/thread.hpp>
 #include <iostream>
 
 #include <Swiften/Client/Client.h>
 #include <Swiften/Network/TimerFactory.h>
 #include <Swiften/Network/BoostNetworkFactories.h>
 #include <Swiften/EventLoop/EventLoop.h>
 #include <Swiften/EventLoop/SimpleEventLoop.h>
 #include <Swiften/Roster/GetRosterRequest.h>
 #include <Swiften/Client/ClientXMLTracer.h>
 
 using namespace Swift;
 
 SimpleEventLoop eventLoop;
 BoostNetworkFactories networkFactories(&eventLoop);
 
 Client* client = 0;
 bool rosterReceived = false;
 enum TestStage {
 	FirstConnect,
 	Reconnect
 };
 TestStage stage;
+ClientOptions options;
 
 void handleDisconnected(boost::optional<ClientError> e) {
 	std::cout << "Disconnected: " << e << std::endl;
 	if (stage == FirstConnect) {
 		stage = Reconnect;
-		client->connect();
+		client->connect(options);
 	}
 	else {
 		eventLoop.stop();
 	}
 }
 
 void handleRosterReceived(boost::shared_ptr<Payload>) {
 	rosterReceived = true;
 	std::cout << "Disconnecting" << std::endl;
 	client->disconnect();
 }
 
 void handleConnected() {
 	std::cout << "Connected" << std::endl;
 	rosterReceived = false;
 	GetRosterRequest::ref rosterRequest = GetRosterRequest::create(client->getIQRouter());
 	rosterRequest->onResponse.connect(boost::bind(&handleRosterReceived, _1));
 	rosterRequest->send();
 }
 
 int main(int, char**) {
 	char* jid = getenv("SWIFT_CLIENTTEST_JID");
 	if (!jid) {
 		std::cerr << "Please set the SWIFT_CLIENTTEST_JID environment variable" << std::endl;
 		return -1;
 	}
 	char* pass = getenv("SWIFT_CLIENTTEST_PASS");
 	if (!pass) {
 		std::cerr << "Please set the SWIFT_CLIENTTEST_PASS environment variable" << std::endl;
 		return -1;
 	}
 
+	char* boshHost = getenv("SWIFT_CLIENTTEST_BOSH_HOST");
+	char* boshPort = getenv("SWIFT_CLIENTTEST_BOSH_PORT");
+	char* boshPath = getenv("SWIFT_CLIENTTEST_BOSH_PATH");
+
+	if (boshHost && boshPort && boshPath) {
+		std::cout << "Using BOSH with URL: http://" << boshHost << ":" << boshPort << "/" << boshPath << std::endl;
+		options.boshURL = URL("http", boshHost, atoi(boshPort), boshPath);
+	}
+
 	client = new Swift::Client(JID(jid), std::string(pass), &networkFactories);
-	ClientXMLTracer* tracer = new ClientXMLTracer(client);
+	ClientXMLTracer* tracer = new ClientXMLTracer(client, !options.boshURL.empty());
 	client->onConnected.connect(&handleConnected);
 	client->onDisconnected.connect(boost::bind(&handleDisconnected, _1));
 	client->setAlwaysTrustCertificates();
 	stage = FirstConnect;
-	client->connect();
+	client->connect(options);
 
 	{
 		Timer::ref timer = networkFactories.getTimerFactory()->createTimer(60000);
 		timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop));
 		timer->start();
 
 		eventLoop.run();
 	}
 
 	delete tracer;
 	delete client;
 	return !rosterReceived;
 }