mgillespie/TinyMqtt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split clients in two collections

Browse Source
This commit is contained in:
hsaturn
2023-01-02 02:18:16 +01:00
parent 0c454bfe3a
commit 3a2db664a8
6 changed files with 98 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/classbind-tests/classbind-tests.ino
View File

@@ -129,6 +129,7 @@ void reset_and_start_servers(int n, bool early_accept = true)
test(classbind_one_client_receives_the_message)
{
set_millis(0);
reset_and_start_servers(2, true);
assertEqual(WiFi.status(), WL_CONNECTED);
@@ -138,7 +139,7 @@ test(classbind_one_client_receives_the_message)
// We have a 2nd ESP in order to test through wifi (opposed to local)
ESP8266WiFiClass::selectInstance(2);
MqttClient client;
MqttClient client("sender");
client.connect(ip_broker.toString().c_str(), 1883);
broker.loop();
assertTrue(client.connected());
@@ -151,12 +152,14 @@ test(classbind_one_client_receives_the_message)
for (int i =0; i<10; i++)
{
add_millis(100);
client.loop();
broker.loop();
}
assertEqual(TestReceiver::messages["receiver"], 1);
assertEqual(unrouted, 0);
set_real_time();
}
test(classbind_routes_should_be_empty_when_receiver_goes_out_of_scope)

25
tests/local-tests/local-tests.ino
View File

@@ -31,13 +31,12 @@ void onPublish(const MqttClient* srce, const Topic& topic, const char* payload,
test(local_client_should_unregister_when_destroyed)
{
MqttBroker broker(1883);
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
{
assertEqual(broker.clientsCount(), (size_t)0); // Ensure client is not yet connected
MqttClient client(&broker);
assertEqual(broker.clientsCount(), (size_t)1); // Ensure client is now connected
assertEqual(broker.localClientsCount(), (size_t)1); // Ensure client is now connected
}
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
}
test(local_client_alive)
@@ -47,31 +46,31 @@ test(local_client_alive)
MqttClient client(&broker);
broker.loop();
assertEqual(broker.clientsCount(), (size_t)1); // Ensure client is now connected
assertEqual(broker.localClientsCount(), (size_t)1); // Ensure client is now connected
add_millis(TINY_MQTT_DEFAULT_ALIVE*1000/2);
broker.loop();
assertEqual(broker.clientsCount(), (size_t)1); // Ensure client is still connected
assertEqual(broker.localClientsCount(), (size_t)1); // Ensure client is still connected
add_seconds(TINY_MQTT_DEFAULT_ALIVE*5);
broker.loop();
assertEqual(broker.clientsCount(), (size_t)1); // Ensure client is still connected
assertEqual(broker.localClientsCount(), (size_t)1); // Ensure client is still connected
}
#if 0
test(local_connect)
{
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient client;
assertTrue(client.connected());
assertEqual(broker.clientsCount(), (size_t)1);
assertEqual(broker.localClientsCount(), (size_t)1);
}
test(local_publish_should_be_dispatched)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber;
subscriber.subscribe("a/b");
@@ -91,7 +90,7 @@ test(local_publish_should_be_dispatched)
test(local_publish_should_be_dispatched_to_local_clients)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber_a("A");
subscriber_a.setCallback(onPublish);
@@ -116,7 +115,7 @@ test(local_publish_should_be_dispatched_to_local_clients)
test(local_unsubscribe)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber;
subscriber.setCallback(onPublish);
@@ -136,7 +135,7 @@ test(local_unsubscribe)
test(local_nocallback_when_destroyed)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient publisher;
{

33
tests/network-tests/network-tests.ino
View File

@@ -9,6 +9,16 @@
#include <string>
#include <iostream>
uint32_t getClientKeepAlive(MqttBroker& broker)
{
if (broker.getClients().size() == 1)
for (auto& it : broker.getClients())
return it->keepAlive();
return 9999;
}
/**
* TinyMqtt network unit tests.
*
@@ -162,7 +172,7 @@ test(network_client_alive)
assertTrue(broker.clientsCount() == 1);
assertTrue(client.connected());
uint32_t ka = broker.getClients()[0]->keepAlive();
uint32_t ka = getClientKeepAlive(broker);
assertEqual(ka, keep_alive);
assertEqual(broker.clientsCount(), (size_t)1);
@@ -212,7 +222,7 @@ test(network_client_keep_alive_high)
uint32_t sz = broker.getClients().size();
assertEqual(sz , (uint32_t)1);
uint32_t ka = broker.getClients()[0]->keepAlive();
uint32_t ka = getClientKeepAlive(broker);
assertEqual(ka, keep_alive);
}
@@ -302,14 +312,14 @@ test(network_one_client_one_broker_hudge_publish_and_subscribe_through_network)
assertEqual((unsigned int)lastLength, (unsigned int)sent.size());
}
test(network_client_should_unregister_when_destroyed)
test(network_local_client_should_unregister_when_destroyed)
{
assertEqual(broker.clientsCount(), (size_t)0);
{
MqttClient client(&broker);
assertEqual(broker.clientsCount(), (size_t)1);
assertEqual(broker.localClientsCount(), (size_t)1);
}
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
}
@@ -322,13 +332,13 @@ test(network_connect)
MqttClient client(&broker);
assertTrue(client.connected());
assertEqual(broker.clientsCount(), (size_t)1);
assertEqual(broker.localClientsCount(), (size_t)1);
}
test(network_publish_should_be_dispatched)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber(&broker);
subscriber.subscribe("a/b");
@@ -429,11 +439,12 @@ test(network_small_payload)
test(network_hudge_payload)
{
const char* payload="This payload is hudge, just because its length exceeds 127. Thus when encoding length, we have to encode it on two bytes at min. This should not prevent the message from being encoded and decoded successfully !";
// const char* payload="This payload is hudge, just because its length exceeds 127. Thus when encoding length, we have to encode it on two bytes at min. This should not prevent the message from being encoded and decoded successfully !";
const char* payload="This was decoded successfully !";
MqttClient subscriber(&broker);
subscriber.setCallback(onPublish);
subscriber.subscribe("a/b"); // Note -> this does not send any byte .... (nowhere to send)
subscriber.subscribe("a/b"); // Note -> this does not send any byte .... (nowhere to send) TODO
MqttClient publisher(&broker);
publisher.publish("a/b", payload); // This publish is received
@@ -442,11 +453,13 @@ test(network_hudge_payload)
assertEqual(payload, lastPayload);
assertEqual(lastLength, strlen(payload));
assertEqual(strcmp(payload, lastPayload), 0);
std::cout << "payload : " << payload << std::endl;
std::cout << "received: " << lastPayload << std::endl;
}
test(connack)
{
const bool view = false;
const bool view = true;
NetworkObserver check(
[this](const WiFiClient*, const uint8_t* buffer, size_t length)

28
tests/nowifi-tests/nowifi-tests.ino
View File

@@ -32,27 +32,27 @@ void onPublish(const MqttClient* srce, const Topic& topic, const char* payload,
test(nowifi_client_should_unregister_when_destroyed)
{
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
{
MqttClient client(&broker);
assertEqual(broker.clientsCount(), (size_t)1);
assertEqual(broker.localClientsCount(), (size_t)1);
}
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
}
test(nowifi_connect)
{
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient client(&broker);
assertTrue(client.connected());
assertEqual(broker.clientsCount(), (size_t)1);
assertEqual(broker.localClientsCount(), (size_t)1);
}
test(nowifi_publish_should_be_dispatched)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber(&broker);
subscriber.subscribe("a/b");
@@ -72,7 +72,7 @@ test(nowifi_publish_should_be_dispatched)
test(nowifi_publish_should_be_dispatched_to_clients)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber_a(&broker, "A");
subscriber_a.setCallback(onPublish);
@@ -97,7 +97,7 @@ test(nowifi_publish_should_be_dispatched_to_clients)
test(nowifi_subscribe_with_star_wildcard)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber(&broker, "A");
subscriber.setCallback(onPublish);
@@ -118,7 +118,7 @@ test(nowifi_subscribe_with_star_wildcard)
test(nowifi_subscribe_with_plus_wildcard)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber(&broker, "A");
subscriber.setCallback(onPublish);
@@ -139,7 +139,7 @@ test(nowifi_subscribe_with_plus_wildcard)
test(nowifi_should_not_receive_sys_msg)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber(&broker, "A");
subscriber.setCallback(onPublish);
@@ -154,7 +154,7 @@ test(nowifi_should_not_receive_sys_msg)
test(nowifi_subscribe_with_mixed_wildcards)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber(&broker, "A");
subscriber.setCallback(onPublish);
@@ -173,7 +173,7 @@ test(nowifi_subscribe_with_mixed_wildcards)
test(nowifi_unsubscribe_with_wildcards)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber(&broker, "A");
subscriber.setCallback(onPublish);
@@ -195,7 +195,7 @@ test(nowifi_unsubscribe_with_wildcards)
test(nowifi_unsubscribe)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient subscriber(&broker);
subscriber.setCallback(onPublish);
@@ -215,7 +215,7 @@ test(nowifi_unsubscribe)
test(nowifi_nocallback_when_destroyed)
{
published.clear();
assertEqual(broker.clientsCount(), (size_t)0);
assertEqual(broker.localClientsCount(), (size_t)0);
MqttClient publisher(&broker);