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
@@ -22,24 +22,25 @@ 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;
@@ -60,25 +61,34 @@ int main(int, char**) {
 		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();
 	}