Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/Network/UnitTest
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Network/UnitTest')
-rw-r--r--Swiften/Network/UnitTest/ConnectorTest.cpp8
-rw-r--r--Swiften/Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Network/UnitTest/ConnectorTest.cpp b/Swiften/Network/UnitTest/ConnectorTest.cpp
index 658aaf7..065911d 100644
--- a/Swiften/Network/UnitTest/ConnectorTest.cpp
+++ b/Swiften/Network/UnitTest/ConnectorTest.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2016 Isode Limited. 2 * Copyright (c) 2010-2018 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -92,7 +92,7 @@ class ConnectorTest : public CppUnit::TestFixture {
92 } 92 }
93 93
94 void testConnect_NoServiceLookups_DefaultPort() { 94 void testConnect_NoServiceLookups_DefaultPort() {
95 Connector::ref testling(createConnector(-1, boost::optional<std::string>())); 95 Connector::ref testling(createConnector(0, boost::optional<std::string>()));
96 resolver->addXMPPClientService("foo.com", host1); 96 resolver->addXMPPClientService("foo.com", host1);
97 resolver->addXMPPClientService("foo.com", host2); 97 resolver->addXMPPClientService("foo.com", host2);
98 resolver->addAddress("foo.com", host3.getAddress()); 98 resolver->addAddress("foo.com", host3.getAddress());
@@ -103,7 +103,7 @@ class ConnectorTest : public CppUnit::TestFixture {
103 CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(connections.size())); 103 CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(connections.size()));
104 CPPUNIT_ASSERT(connections[0]); 104 CPPUNIT_ASSERT(connections[0]);
105 CPPUNIT_ASSERT(host3.getAddress() == (*(connections[0]->hostAddressPort)).getAddress()); 105 CPPUNIT_ASSERT(host3.getAddress() == (*(connections[0]->hostAddressPort)).getAddress());
106 CPPUNIT_ASSERT_EQUAL(5222, (*(connections[0]->hostAddressPort)).getPort()); 106 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(5222), (*(connections[0]->hostAddressPort)).getPort());
107 CPPUNIT_ASSERT(!std::dynamic_pointer_cast<DomainNameResolveError>(error)); 107 CPPUNIT_ASSERT(!std::dynamic_pointer_cast<DomainNameResolveError>(error));
108 } 108 }
109 109
@@ -328,7 +328,7 @@ class ConnectorTest : public CppUnit::TestFixture {
328 328
329 329
330 private: 330 private:
331 Connector::ref createConnector(int port = -1, boost::optional<std::string> serviceLookupPrefix = boost::optional<std::string>("_xmpp-client._tcp.")) { 331 Connector::ref createConnector(unsigned short port = 0, boost::optional<std::string> serviceLookupPrefix = boost::optional<std::string>("_xmpp-client._tcp.")) {
332 Connector::ref connector = Connector::create("foo.com", port, serviceLookupPrefix, resolver, connectionFactory, timerFactory); 332 Connector::ref connector = Connector::create("foo.com", port, serviceLookupPrefix, resolver, connectionFactory, timerFactory);
333 connector->onConnectFinished.connect(boost::bind(&ConnectorTest::handleConnectorFinished, this, _1, _2)); 333 connector->onConnectFinished.connect(boost::bind(&ConnectorTest::handleConnectorFinished, this, _1, _2));
334 return connector; 334 return connector;
diff --git a/Swiften/Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp b/Swiften/Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp
index 1a160b7..065d015 100644
--- a/Swiften/Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp
+++ b/Swiften/Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2016 Isode Limited. 2 * Copyright (c) 2010-2018 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -421,7 +421,7 @@ class HTTPConnectProxiedConnectionTest : public CppUnit::TestFixture {
421 private: 421 private:
422 std::string proxyHost; 422 std::string proxyHost;
423 HostAddressPort proxyHostAddress; 423 HostAddressPort proxyHostAddress;
424 int proxyPort; 424 unsigned short proxyPort;
425 HostAddressPort host; 425 HostAddressPort host;
426 DummyEventLoop* eventLoop; 426 DummyEventLoop* eventLoop;
427 StaticDomainNameResolver* resolver; 427 StaticDomainNameResolver* resolver;