1 files changed, 24 insertions, 5 deletions
diff --git a/Swiften/Network/UnitTest/ConnectorTest.cpp b/Swiften/Network/UnitTest/ConnectorTest.cpp
index 8524439..065911d 100644
--- a/Swiften/Network/UnitTest/ConnectorTest.cpp
+++ b/Swiften/Network/UnitTest/ConnectorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -26,6 +26,7 @@ class ConnectorTest : public CppUnit::TestFixture {
         CPPUNIT_TEST(testConnect);
         CPPUNIT_TEST(testConnect_NoServiceLookups);
         CPPUNIT_TEST(testConnect_NoServiceLookups_DefaultPort);
+        CPPUNIT_TEST(testConnect_OnlyLiteral);
         CPPUNIT_TEST(testConnect_FirstAddressHostFails);
         CPPUNIT_TEST(testConnect_NoSRVHost);
         CPPUNIT_TEST(testConnect_NoHosts);
@@ -91,7 +92,7 @@ class ConnectorTest : public CppUnit::TestFixture {
         }
 
         void testConnect_NoServiceLookups_DefaultPort() {
-            Connector::ref testling(createConnector(-1, boost::optional<std::string>()));
+            Connector::ref testling(createConnector(0, boost::optional<std::string>()));
             resolver->addXMPPClientService("foo.com", host1);
             resolver->addXMPPClientService("foo.com", host2);
             resolver->addAddress("foo.com", host3.getAddress());
@@ -102,7 +103,7 @@ class ConnectorTest : public CppUnit::TestFixture {
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(connections.size()));
             CPPUNIT_ASSERT(connections[0]);
             CPPUNIT_ASSERT(host3.getAddress() == (*(connections[0]->hostAddressPort)).getAddress());
-            CPPUNIT_ASSERT_EQUAL(5222, (*(connections[0]->hostAddressPort)).getPort());
+            CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(5222), (*(connections[0]->hostAddressPort)).getPort());
             CPPUNIT_ASSERT(!std::dynamic_pointer_cast<DomainNameResolveError>(error));
         }
 
@@ -119,6 +120,21 @@ class ConnectorTest : public CppUnit::TestFixture {
             CPPUNIT_ASSERT(!std::dynamic_pointer_cast<DomainNameResolveError>(error));
         }
 
+        void testConnect_OnlyLiteral() {
+            auto testling = Connector::create("1.1.1.1", 1234, boost::none, resolver, connectionFactory, timerFactory);
+            testling->onConnectFinished.connect(boost::bind(&ConnectorTest::handleConnectorFinished, this, _1, _2));
+
+            auto address1 = HostAddress::fromString("1.1.1.1").get();
+            connectionFactory->failingPorts.push_back(HostAddressPort(address1, 1234));
+
+            testling->start();
+            eventLoop->processEvents();
+
+            CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(connections.size()));
+            CPPUNIT_ASSERT(!connections[0]);
+            CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(connectionFactory->createdConnections.size()));
+        }
+
         void testConnect_FirstAddressHostFails() {
             Connector::ref testling(createConnector());
 
@@ -312,7 +328,7 @@ class ConnectorTest : public CppUnit::TestFixture {
 
 
     private:
-        Connector::ref createConnector(int port = -1, boost::optional<std::string> serviceLookupPrefix = boost::optional<std::string>("_xmpp-client._tcp.")) {
+        Connector::ref createConnector(unsigned short port = 0, boost::optional<std::string> serviceLookupPrefix = boost::optional<std::string>("_xmpp-client._tcp.")) {
             Connector::ref connector = Connector::create("foo.com", port, serviceLookupPrefix, resolver, connectionFactory, timerFactory);
             connector->onConnectFinished.connect(boost::bind(&ConnectorTest::handleConnectorFinished, this, _1, _2));
             return connector;
@@ -356,12 +372,15 @@ class ConnectorTest : public CppUnit::TestFixture {
             }
 
             std::shared_ptr<Connection> createConnection() {
-                return std::make_shared<MockConnection>(failingPorts, isResponsive, eventLoop);
+                auto connection = std::make_shared<MockConnection>(failingPorts, isResponsive, eventLoop);
+                createdConnections.push_back(connection);
+                return connection;
             }
 
             EventLoop* eventLoop;
             bool isResponsive;
             std::vector<HostAddressPort> failingPorts;
+            std::vector<std::shared_ptr<MockConnection>> createdConnections;
         };
 
     private: