1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp b/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
index 8dbd09e..5d6fedd 100644
--- a/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
+++ b/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
@@ -42,61 +42,61 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
     CPPUNIT_TEST(testSession);
     CPPUNIT_TEST(testWrite_Empty);
     CPPUNIT_TEST_SUITE_END();
 
     public:
         void setUp() {
             to = "wonderland.lit";
             path = "/http-bind";
             port = "5280";
             sid = "MyShinySID";
             initial = "<body wait='60' "
                     "inactivity='30' "
                     "polling='5' "
                     "requests='2' "
                     "hold='1' "
                     "maxpause='120' "
                     "sid='" + sid + "' "
                     "ver='1.6' "
                     "from='wonderland.lit' "
                     "xmlns='http://jabber.org/protocol/httpbind'/>";
             eventLoop = new DummyEventLoop();
             connectionFactory = new MockConnectionFactory(eventLoop);
             boshURL = URL("http", to, 5280, path);
             sessionTerminated = 0;
             sessionStarted = 0;
             initialRID = 2349876;
             xmppDataRead.clear();
             boshDataRead.clear();
             boshDataWritten.clear();
             resolver = new StaticDomainNameResolver(eventLoop);
-            resolver->addAddress(to, HostAddress("127.0.0.1"));
+            resolver->addAddress(to, HostAddress::fromString("127.0.0.1").get());
             timerFactory = new DummyTimerFactory();
         }
 
         void tearDown() {
             eventLoop->processEvents();
             delete connectionFactory;
             delete resolver;
             delete timerFactory;
             delete eventLoop;
         }
 
         void testConnectionCount_OneWrite() {
             PoolRef testling = createTestling();
             CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
             eventLoop->processEvents();
             CPPUNIT_ASSERT_EQUAL(0, sessionStarted);
             readResponse(initial, connectionFactory->connections[0]);
             CPPUNIT_ASSERT_EQUAL(1, sessionStarted);
             CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
             testling->write(createSafeByteArray("<blah/>"));
             eventLoop->processEvents();
             CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
             CPPUNIT_ASSERT_EQUAL(1, sessionStarted);
         }
 
         void testConnectionCount_TwoWrites() {
             PoolRef testling = createTestling();
             CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
             eventLoop->processEvents();
             readResponse(initial, connectionFactory->connections[0]);
@@ -207,61 +207,61 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
             CPPUNIT_ASSERT(c1->pending);
             CPPUNIT_ASSERT_EQUAL(st(4), boshDataWritten.size()); /* don't send empty in [0], still have [1] waiting */
             CPPUNIT_ASSERT_EQUAL(st(2), connectionFactory->connections.size());
 
             rid++;
             readResponse("<body xmlns='http://jabber.org/protocol/httpbind'><message><splatploing><blittlebarg/></splatploing></message></body>", c1);
             eventLoop->processEvents();
             CPPUNIT_ASSERT(!c1->pending);
             CPPUNIT_ASSERT(c0->pending);
             CPPUNIT_ASSERT_EQUAL(st(5), boshDataWritten.size()); /* empty to make room */
             CPPUNIT_ASSERT_EQUAL(st(2), connectionFactory->connections.size());
 
             rid++;
             testling->write(createSafeByteArray("<bleh/>"));
             eventLoop->processEvents();
             CPPUNIT_ASSERT(c0->pending);
             CPPUNIT_ASSERT(c1->pending);
             CPPUNIT_ASSERT_EQUAL(st(6), boshDataWritten.size()); /* data */
 
             rid++;
             testling->write(createSafeByteArray("<bluh/>"));
             CPPUNIT_ASSERT(c0->pending);
             CPPUNIT_ASSERT(c1->pending);
             CPPUNIT_ASSERT_EQUAL(st(6), boshDataWritten.size()); /* Don't send data, no room */
             eventLoop->processEvents();
             CPPUNIT_ASSERT_EQUAL(st(2), connectionFactory->connections.size());
         }
 
         void testSession() {
             to = "prosody.doomsong.co.uk";
-            resolver->addAddress("prosody.doomsong.co.uk", HostAddress("127.0.0.1"));
+            resolver->addAddress("prosody.doomsong.co.uk", HostAddress::fromString("127.0.0.1").get());
             path = "/http-bind/";
             boshURL = URL("http", to, 5280, path);
 
             PoolRef testling = createTestling();
             CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
             eventLoop->processEvents();
             CPPUNIT_ASSERT_EQUAL(st(1), boshDataWritten.size()); /* header*/
             CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
 
             std::string response = "<body authid='743da605-4c2e-4de1-afac-ac040dd4a940' xmpp:version='1.0' xmlns:stream='http://etherx.jabber.org/streams' xmlns:xmpp='urn:xmpp:xbosh' inactivity='60' wait='60' polling='5' secure='true' hold='1' from='prosody.doomsong.co.uk' ver='1.6' sid='743da605-4c2e-4de1-afac-ac040dd4a940' requests='2' xmlns='http://jabber.org/protocol/httpbind'><stream:features><auth xmlns='http://jabber.org/features/iq-auth'/><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>SCRAM-SHA-1</mechanism><mechanism>DIGEST-MD5</mechanism></mechanisms></stream:features></body>";
             readResponse(response, connectionFactory->connections[0]);
             eventLoop->processEvents();
             CPPUNIT_ASSERT_EQUAL(st(1), boshDataWritten.size());
             CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
 
             std::string send = "<auth xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\" mechanism=\"SCRAM-SHA-1\">biwsbj1hZG1pbixyPWZhOWE5ZDhiLWZmMDctNGE4Yy04N2E3LTg4YWRiNDQxZGUwYg==</auth>";
             testling->write(createSafeByteArray(send));
             eventLoop->processEvents();
             CPPUNIT_ASSERT_EQUAL(st(2), boshDataWritten.size());
             CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
 
             response = "<body xmlns='http://jabber.org/protocol/httpbind' sid='743da605-4c2e-4de1-afac-ac040dd4a940' xmlns:stream = 'http://etherx.jabber.org/streams'><challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cj1mYTlhOWQ4Yi1mZjA3LTRhOGMtODdhNy04OGFkYjQ0MWRlMGJhZmZlMWNhMy1mMDJkLTQ5NzEtYjkyNS0yM2NlNWQ2MDQyMjYscz1OVGd5WkdWaFptTXRaVE15WXkwMFpXUmhMV0ZqTURRdFpqYzRNbUppWmpGa1pqWXgsaT00MDk2</challenge></body>";
             readResponse(response, connectionFactory->connections[0]);
             eventLoop->processEvents();
             CPPUNIT_ASSERT_EQUAL(st(2), boshDataWritten.size());
             CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
 
             send = "<response xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">Yz1iaXdzLHI9ZmE5YTlkOGItZmYwNy00YThjLTg3YTctODhhZGI0NDFkZTBiYWZmZTFjYTMtZjAyZC00OTcxLWI5MjUtMjNjZTVkNjA0MjI2LHA9aU11NWt3dDN2VWplU2RqL01Jb3VIRldkZjBnPQ==</response>";
             testling->write(createSafeByteArray(send));
             eventLoop->processEvents();