Add DTLS test, fixes regarding QoS

Author: michalpasztamobica

README.md

@@ -32,11 +32,10 @@ Example code:
 #include <MQTTClientMbedOs.h>
 
 NetworkInterface *net = NetworkInterface::get_default_instance();
-SocketAddress sockAddr(hostname, port);
 TCPSocket socket;
 MQTTClient client(&socket);
 socket.open(net);
-socket.connect(sockAddr);
+socket.connect(hostname, port);
 ```
 
 The socket has to be opened and connected in order for the client to be able to interact with the broker.
@@ -70,7 +69,7 @@ mqttNet.connect(mqtt_global::hostname, mqtt_global::port);
 
 The MQTTNetwork has to `connect` to a broker, given its address and port number.
 
-
+#### API usage ####
 
 Apart from lanaguage details and different creation and initialization procedure, the APIs of both the legacy and new API are the same.
 

TESTS/mqtt/mqtt/main.cpp

@@ -123,9 +123,9 @@ Case cases[] = {
 
 #if MBED_CONF_MBED_MQTT_TESTS_MQTT_SN_ENABLE
     // MQTT-SN
-    Case("MQTTSN_LEGACY_TEST_CONNECT", MQTTSN_LEGACY_TEST_CONNECT),
+    Case("MQTTSN_LEGACY_CONNECT", MQTTSN_LEGACY_CONNECT),
     Case("MQTTSN_LEGACY_CONNECT_NOT_CONNECTED", MQTTSN_LEGACY_CONNECT_NOT_CONNECTED),
-    Case("MQTTSN_LEGACY_TEST_SUBSCRIBE", MQTTSN_LEGACY_TEST_SUBSCRIBE),
+    Case("MQTTSN_LEGACY_SUBSCRIBE", MQTTSN_LEGACY_SUBSCRIBE),
     Case("MQTTSN_LEGACY_SUBSCRIBE_NETWORK_NOT_CONNECTED", MQTTSN_LEGACY_SUBSCRIBE_NETWORK_NOT_CONNECTED),
 //    Case("MQTTSN_LEGACY_SUBSCRIBE_CLIENT_NOT_CONNECTED", MQTTSN_LEGACY_SUBSCRIBE_CLIENT_NOT_CONNECTED),
     Case("MQTTSN_LEGACY_SUBSCRIBE_TOPIC_TOO_LONG", MQTTSN_LEGACY_SUBSCRIBE_TOPIC_TOO_LONG),
@@ -135,7 +135,7 @@ Case cases[] = {
 #endif
     Case("MQTTSN_LEGACY_UNSUBSCRIBE_WITHOUT_SUBSCRIBE", MQTTSN_LEGACY_UNSUBSCRIBE_WITHOUT_SUBSCRIBE),
     Case("MQTTSN_LEGACY_UNSUBSCRIBE_INVALID", MQTTSN_LEGACY_UNSUBSCRIBE_INVALID),
-    Case("MQTTSN_LEGACY_TEST_PUBLISH", MQTTSN_LEGACY_TEST_PUBLISH),
+    Case("MQTTSN_LEGACY_PUBLISH", MQTTSN_LEGACY_PUBLISH),
     Case("MQTTSN_LEGACY_PUBLISH_NOT_CONNECTED", MQTTSN_LEGACY_PUBLISH_NOT_CONNECTED),
     Case("MQTTSN_LEGACY_PUBLISH_TOPIC_TOO_LONG", MQTTSN_LEGACY_PUBLISH_TOPIC_TOO_LONG),
     Case("MQTTSN_LEGACY_UDP_CONNECT_SUBSCRIBE_PUBLISH", MQTTSN_LEGACY_UDP_CONNECT_SUBSCRIBE_PUBLISH),
@@ -187,6 +187,7 @@ Case cases[] = {
     Case("MQTTSN_PUBLISH_NOT_CONNECTED", MQTTSN_PUBLISH_NOT_CONNECTED),
     Case("MQTTSN_PUBLISH_TOPIC_TOO_LONG", MQTTSN_PUBLISH_TOPIC_TOO_LONG),
     Case("MQTTSN_UDP_CONNECT_SUBSCRIBE_PUBLISH", MQTTSN_UDP_CONNECT_SUBSCRIBE_PUBLISH),
+    Case("MQTTSN_DTLS_CONNECT_SUBSCRIBE_PUBLISH", MQTTSN_DTLS_CONNECT_SUBSCRIBE_PUBLISH),
     Case("MQTTSN_IS_CONNECTED", MQTTSN_IS_CONNECTED),
     Case("MQTTSN_IS_CONNECTED_CLIENT_NOT_CONNECTED", MQTTSN_IS_CONNECTED_CLIENT_NOT_CONNECTED),
     Case("MQTTSN_IS_CONNECTED_NETWORK_NOT_CONNECTED", MQTTSN_IS_CONNECTED_NETWORK_NOT_CONNECTED),
@@ -253,7 +254,7 @@ utest::v1::status_t test_setup(const size_t number_of_cases)
 
     // Prepare a default message, to avoid code duplication at a later stage.
     sprintf(mqtt_global::message_buffer, "%s", "MQTT_MBED_OS_TEST_MESSAGE");
-    mqtt_global::default_message.qos = MQTT::QOS1;
+    mqtt_global::default_message.qos = MQTT::QOS0;
     mqtt_global::default_message.retained = false;
     mqtt_global::default_message.dup = false;
     mqtt_global::default_message.payload = (void*)mqtt_global::message_buffer;

TESTS/mqtt/mqtt/mqtt-sn_legacy.cpp

@@ -31,7 +31,7 @@
 
 #define MQTTSN_LEGACY_API_DEINIT() TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, mqttNet.disconnect());
 
-void MQTTSN_LEGACY_TEST_CONNECT()
+void MQTTSN_LEGACY_CONNECT()
 {
     MQTTSN_LEGACY_API_INIT();
     data.clientID.cstring = (char*)"MQTTSN_LEGACY_CONNECT";
@@ -51,7 +51,7 @@ void MQTTSN_LEGACY_CONNECT_NOT_CONNECTED()
     TEST_ASSERT_EQUAL(-1, client.connect(data));
 }
 
-void MQTTSN_LEGACY_TEST_SUBSCRIBE()
+void MQTTSN_LEGACY_SUBSCRIBE()
 {
     MQTTSN_LEGACY_API_INIT();
     data.clientID.cstring = (char*)"MQTTSN_LEGACY_TEST_SUBSCRIBE";
@@ -163,7 +163,7 @@ void MQTTSN_LEGACY_UNSUBSCRIBE_INVALID()
     MQTTSN_LEGACY_API_DEINIT();
 }
 
-void MQTTSN_LEGACY_TEST_PUBLISH()
+void MQTTSN_LEGACY_PUBLISH()
 {
     MQTTSN_LEGACY_API_INIT();
     data.clientID.cstring = (char*)"MQTTSN_LEGACY_PUBLISH";

TESTS/mqtt/mqtt/mqtt-sn_new.cpp

@@ -261,3 +261,20 @@ void MQTTSN_UDP_CONNECT_SUBSCRIBE_PUBLISH()
 
     socket.close();
 }
+
+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));
+    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);
+    TEST_ASSERT(NSAPI_ERROR_OK == ret);
+
+    MQTTClient client(socket);
+
+    send_messages_sn< MQTTClient >(client, "MQTTSN_DTLS_CONNECT_SUBSCRIBE_PUBLISH");
+
+    socket->close();
+    delete socket;
+}

TESTS/mqtt/mqtt/mqtt_tests.h

@@ -76,16 +76,16 @@ void MQTT_LEGACY_CONNECT_SUBSCRIBE_PUBLISH_USER_PASSWORD();
 void MQTT_LEGACY_TLS_CONNECT_SUBSCRIBE_PUBLISH();
 
 void MQTTSN_LEGACY_CONNECT_NOT_CONNECTED();
-void MQTTSN_LEGACY_TEST_CONNECT(); // Avoid clash with MQTTSN enum.
-void MQTTSN_LEGACY_TEST_SUBSCRIBE(); // Avoid clash with MQTTSN enum.
+void MQTTSN_LEGACY_CONNECT();
+void MQTTSN_LEGACY_SUBSCRIBE();
 void MQTTSN_LEGACY_SUBSCRIBE_NETWORK_NOT_CONNECTED();
 void MQTTSN_LEGACY_SUBSCRIBE_CLIENT_NOT_CONNECTED();
 void MQTTSN_LEGACY_SUBSCRIBE_TOPIC_TOO_LONG();
 void MQTTSN_LEGACY_SUBSCRIBE_INVALID_MESSAGE_HANDLER();
 void MQTTSN_LEGACY_SUBSCRIBE_RECEIVE();
 void MQTTSN_LEGACY_UNSUBSCRIBE_WITHOUT_SUBSCRIBE();
 void MQTTSN_LEGACY_UNSUBSCRIBE_INVALID();
-void MQTTSN_LEGACY_TEST_PUBLISH();
+void MQTTSN_LEGACY_PUBLISH();
 void MQTTSN_LEGACY_PUBLISH_NOT_CONNECTED();
 void MQTTSN_LEGACY_PUBLISH_TOPIC_TOO_LONG();
 void MQTTSN_LEGACY_IS_CONNECTED();
@@ -130,6 +130,7 @@ void MQTTSN_IS_CONNECTED();
 void MQTTSN_IS_CONNECTED_CLIENT_NOT_CONNECTED();
 void MQTTSN_IS_CONNECTED_NETWORK_NOT_CONNECTED();
 void MQTTSN_UDP_CONNECT_SUBSCRIBE_PUBLISH();
+void MQTTSN_DTLS_CONNECT_SUBSCRIBE_PUBLISH();
 
 template <class Client> void send_messages(Client &client, char *clientID, bool user_password = false) {
     arrivedcount = 0;
@@ -141,7 +142,7 @@ template <class Client> void send_messages(Client &client, char *clientID, bool
         data.password.cstring = (char*)MBED_CONF_MBED_MQTT_TESTS_PASSWORD;
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, client.connect(data));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, client.subscribe(mqtt_global::topic, MQTT::QOS1, messageArrived));
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, client.subscribe(mqtt_global::topic, MQTT::QOS2, messageArrived));
 
     MQTT::Message message = mqtt_global::default_message;
 
@@ -168,7 +169,7 @@ template <class Client> void send_messages(Client &client, char *clientID, bool
 //    sprintf(buf, "QoS 2 %s\n", clientID);
 //    message.qos = MQTT::QOS2;
 //    message.payloadlen = strlen(buf)+1;
-//    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, client.publish(topic, message));
+//    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, client.publish(mqtt_global::topic, message));
 //    while (arrivedcount < 3)
 //        client.yield(100);
 
@@ -199,17 +200,17 @@ template <class Client> void send_messages_sn(Client &client, char *clientID) {
         client.yield(10);
 
     // QoS 1
-//    MQTTSN::Message message;
-//    char buf[100];
-//    sprintf(buf, "QoS 1 %s\n", clientID);
-//    message.qos = MQTTSN::QOS0;
-//    message.retained = false;
-//    message.dup = false;
-//    message.payload = (void*)buf;
-//    message.payloadlen = strlen(buf)+1;
-//    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, client.publish(topic, message));
-//    while (arrivedcountSN < 2)
-//        client.yield(10);
+    MQTTSN::Message message;
+    char buf[100];
+    sprintf(buf, "QoS 1 %s\n", clientID);
+    message.qos = MQTTSN::QOS0;
+    message.retained = false;
+    message.dup = false;
+    message.payload = (void*)buf;
+    message.payloadlen = strlen(buf)+1;
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, client.publish(topic, message));
+    while (arrivedcountSN < 2)
+        client.yield(10);
 
 //    // QoS 2
 //    sprintf(buf, "QoS 2 %s\n", clientID);