Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2018-10-29 16:28:14 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2018-11-08 11:31:20 (GMT) |
| commit | cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f (patch) | |
| tree | 69e11e13ff2e5127d2cbfcc164be761cf104a1b2 /Swiften/Network/UnitTest/ConnectorTest.cpp | |
| parent | 5ce9e19ef0744f530a797c30a82e9723eb7ea306 (diff) | |
| download | swift-cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f.zip swift-cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f.tar.bz2 | |
Consistently use unsigned short for network ports
Network ports are now consistently stored as unsigned shorts, apart from
the options and user interface, where -1 is still used to denote the use
of default ports.
Test-Information:
Unit tests pass on macOS 10.13 and Debian 9
On macOS: tested the UI with various proxy and manual ports, behaviour
as expected.
Change-Id: I7a65f40083022887aa30ed7b21eadc56d0c52be1
Diffstat (limited to 'Swiften/Network/UnitTest/ConnectorTest.cpp')
| -rw-r--r-- | Swiften/Network/UnitTest/ConnectorTest.cpp | 8 |
1 files changed, 4 insertions, 4 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; |