Remove string-based API from test files

michalpasztamobica · michalpasztamobica · commit 082d3f34d220 · 2020-01-16T19:51:43.000+01:00
diff --git a/TESTS/mqtt/mqtt/main.cpp b/TESTS/mqtt/mqtt/main.cpp
@@ -323,7 +323,12 @@ utest::v1::status_t test_setup(const size_t number_of_cases)
     NetworkInterface *net = NetworkInterface::get_default_instance();
     nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
-    printf("MBED: TCPClient IP address is '%s'\n", net->get_ip_address());
+
+    SocketAddress addr;
+    err = net->get_ip_address(&addr);
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
+
+    printf("MBED: TCPClient IP address is '%s'\n", addr.get_ip_address());
 
     // Generate an string of length MAX_MQTT_PACKET_SIZE+1 with alphabet letters.
     char c = 'a';
diff --git a/TESTS/mqtt/mqtt/mqtt-sn_new.cpp b/TESTS/mqtt/mqtt/mqtt-sn_new.cpp
@@ -22,7 +22,9 @@
 #define MQTTSN_API_INIT() \
     arrivedcountSN = 0; \
     NetworkInterface *net = NetworkInterface::get_default_instance(); \
-    SocketAddress sockAddr(mqtt_global::hostname, mqtt_global::port_udp); \
+    SocketAddress sockAddr; \
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname(mqtt_global::hostname, &sockAddr)); \
+    sockAddr.set_port(mqtt_global::port_udp); \
     UDPSocket socket; \
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, socket.open(net)); \
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, socket.connect(sockAddr)); \
@@ -268,8 +270,11 @@ void MQTTSN_DTLS_CONNECT_SUBSCRIBE_PUBLISH()
     NetworkInterface *net = NetworkInterface::get_default_instance();
     DTLSSocket *socket = new DTLSSocket; // Allocate on heap to avoid stack overflow.
     TEST_ASSERT(NSAPI_ERROR_OK == socket->open(net));
+    SocketAddress addr;
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname(mqtt_global::hostname, &addr));
+    addr.set_port(mqtt_global::port_udp);
     TEST_ASSERT(NSAPI_ERROR_OK == socket->set_root_ca_cert(mqtt_global::SSL_CA_PEM));
-    int ret = socket->connect(mqtt_global::hostname, mqtt_global::port_udp);
+    int ret = socket->connect(addr);
     TEST_ASSERT(NSAPI_ERROR_OK == ret);
 
     MQTTClient client(socket);
diff --git a/TESTS/mqtt/mqtt/mqtt_new.cpp b/TESTS/mqtt/mqtt/mqtt_new.cpp
@@ -23,8 +23,11 @@
     arrivedcount = 0; \
     NetworkInterface *net = NetworkInterface::get_default_instance(); \
     TCPSocket socket; \
+    SocketAddress addr; \
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, socket.open(net)); \
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, socket.connect(mqtt_global::hostname, mqtt_global::port)); \
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname(mqtt_global::hostname, &addr)); \
+    addr.set_port(mqtt_global::port); \
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, socket.connect(addr)); \
     MQTTClient client(&socket); \
     MQTTPacket_connectData data = MQTTPacket_connectData_initializer; \
     MQTT_API_ATTACH_USERNAME_PASSWORD() \
@@ -70,7 +73,8 @@ void MQTT_SUBSCRIBE_NETWORK_NOT_CONNECTED()
     NetworkInterface *net = NetworkInterface::get_default_instance();
     TCPSocket socket;
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, socket.open(net));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_DNS_FAILURE, socket.connect("i.dont.exist", mqtt_global::port));
+    SocketAddress addr; // intentionally empty
+    TEST_ASSERT_NOT_EQUAL(NSAPI_ERROR_OK, socket.connect(addr));
     MQTTClient client(&socket);
     MQTTPacket_connectData data = MQTTPacket_connectData_initializer;
     data.MQTTVersion = 3;
@@ -141,7 +145,7 @@ void MQTT_UNSUBSCRIBE_INVALID()
 void MQTT_PUBLISH()
 {
     MQTT_API_INIT();
-    data.clientID.cstring = (char *)"MQTT_nnPUBLISH";
+    data.clientID.cstring = (char *)"MQTT_PUBLISH";
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, client.connect(data));
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, client.publish(mqtt_global::topic, mqtt_global::default_message));
     MQTT::Message msg = mqtt_global::default_message;
@@ -186,7 +190,11 @@ void MQTT_CONNECT_SUBSCRIBE_PUBLISH()
     NetworkInterface *net = NetworkInterface::get_default_instance();
     TCPSocket socket;
     socket.open(net);
-    socket.connect(mqtt_global::hostname, mqtt_global::port);
+    SocketAddress addr;
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname(mqtt_global::hostname, &addr));
+    addr.set_port(mqtt_global::port);
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, socket.connect(addr));
+    socket.connect(addr);
 
     MQTTClient client(&socket);
 
@@ -201,7 +209,10 @@ void MQTT_TLS_CONNECT_SUBSCRIBE_PUBLISH()
     TLSSocket *socket = new TLSSocket; // Allocate on heap to avoid stack overflow.
     TEST_ASSERT(NSAPI_ERROR_OK == socket->open(net));
     TEST_ASSERT(NSAPI_ERROR_OK == socket->set_root_ca_cert(mqtt_global::SSL_CA_PEM));
-    int ret = socket->connect(mqtt_global::hostname, mqtt_global::port_tls);
+    SocketAddress addr;
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname(mqtt_global::hostname, &addr));
+    addr.set_port(mqtt_global::port_tls);
+    int ret = socket->connect(addr);
     TEST_ASSERT(NSAPI_ERROR_OK == ret);
 
     MQTTClient client(socket);
@@ -218,7 +229,10 @@ void MQTT_CONNECT_SUBSCRIBE_PUBLISH_USER_PASSWORD()
     NetworkInterface *net = NetworkInterface::get_default_instance();
     TCPSocket socket;
     socket.open(net);
-    socket.connect(mqtt_global::hostname, mqtt_global::port);
+    SocketAddress addr;
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname(mqtt_global::hostname, &addr));
+    addr.set_port(mqtt_global::port);
+    socket.connect(addr);
 
     MQTTClient client(&socket);
 
diff --git a/src/MQTTClientMbedOs.cpp b/src/MQTTClientMbedOs.cpp
@@ -196,17 +196,16 @@ nsapi_error_t MQTTClient::disconnect()
 bool MQTTClient::isConnected()
 {
     if (client != NULL) {
-        return NSAPI_ERROR_UNSUPPORTED;
+        return false;
     } else if (clientSN == NULL) {
-        return NSAPI_ERROR_NO_CONNECTION;
+        return false;
     } else {
         return clientSN->isConnected();
     }
 }
 
 void MQTTClient::setDefaultMessageHandler(messageHandler mh)
 {
-    nsapi_error_t ret = NSAPI_ERROR_OK;
     if (client != NULL) {
         client->setDefaultMessageHandler(mh);
     } else if (clientSN != NULL) {
diff --git a/src/MQTTNetwork.h b/src/MQTTNetwork.h
@@ -60,7 +60,10 @@ class MQTTNetwork {
         if ((ret = socket->open(network)) != NSAPI_ERROR_OK) {
             return ret;
         }
-        return socket->connect(hostname, port);
+        SocketAddress addr;
+        network->gethostbyname(hostname, &addr);
+        addr.set_port(port);
+        return socket->connect(addr);
     }
 
     int disconnect()
diff --git a/src/MQTTNetworkTLS.h b/src/MQTTNetworkTLS.h
@@ -63,6 +63,12 @@ class MQTTNetworkTLS {
         if (ret < 0) {
             return ret;
         }
+        SocketAddress addr;
+        ret = network->gethostbyname(hostname, &addr);
+        if (ret < 0) {
+            return ret;
+        }
+        addr.set_port(port);
         ret = socket->set_root_ca_cert(ssl_ca_pem);
         if (ret < 0) {
             return ret;
@@ -73,7 +79,7 @@ class MQTTNetworkTLS {
                 return ret;
             }
         }
-        return socket->connect(hostname, port);
+        return socket->connect(addr);
     }
 
     int disconnect()

Original file line number	Diff line number	Diff line change
`@@ -196,17 +196,16 @@ nsapi_error_t MQTTClient::disconnect()`
`196`	`196`	`bool MQTTClient::isConnected()`
`197`	`197`	`{`
`198`	`198`	`if (client != NULL) {`
`199`		`- return NSAPI_ERROR_UNSUPPORTED;`
	`199`	`+ return false;`
`200`	`200`	`} else if (clientSN == NULL) {`
`201`		`- return NSAPI_ERROR_NO_CONNECTION;`
	`201`	`+ return false;`
`202`	`202`	`} else {`
`203`	`203`	`return clientSN->isConnected();`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`void MQTTClient::setDefaultMessageHandler(messageHandler mh)`
`208`	`208`	`{`
`209`		`- nsapi_error_t ret = NSAPI_ERROR_OK;`
`210`	`209`	`if (client != NULL) {`
`211`	`210`	`client->setDefaultMessageHandler(mh);`
`212`	`211`	`} else if (clientSN != NULL) {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,10 @@ class MQTTNetwork {`
`60`	`60`	`if ((ret = socket->open(network)) != NSAPI_ERROR_OK) {`
`61`	`61`	`return ret;`
`62`	`62`	`}`
`63`		`- return socket->connect(hostname, port);`
	`63`	`+ SocketAddress addr;`
	`64`	`+ network->gethostbyname(hostname, &addr);`
	`65`	`+ addr.set_port(port);`
	`66`	`+ return socket->connect(addr);`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`int disconnect()`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,12 @@ class MQTTNetworkTLS {`
`63`	`63`	`if (ret < 0) {`
`64`	`64`	`return ret;`
`65`	`65`	`}`
	`66`	`+ SocketAddress addr;`
	`67`	`+ ret = network->gethostbyname(hostname, &addr);`
	`68`	`+ if (ret < 0) {`
	`69`	`+ return ret;`
	`70`	`+ }`
	`71`	`+ addr.set_port(port);`
`66`	`72`	`ret = socket->set_root_ca_cert(ssl_ca_pem);`
`67`	`73`	`if (ret < 0) {`
`68`	`74`	`return ret;`
`@@ -73,7 +79,7 @@ class MQTTNetworkTLS {`
`73`	`79`	`return ret;`
`74`	`80`	`}`
`75`	`81`	`}`
`76`		`- return socket->connect(hostname, port);`
	`82`	`+ return socket->connect(addr);`
`77`	`83`	`}`
`78`	`84`
`79`	`85`	`int disconnect()`