From e71ffefc5a0499de373ef83283c9622171af9a7b Mon Sep 17 00:00:00 2001
From: hsaturn <hsaturn.gmail.com>
Date: Wed, 31 Mar 2021 00:22:31 +0200
Subject: [PATCH] Fixed a useless test and modified MqttClient constructors

---
 .gitignore                          |  1 +
 src/TinyMqtt.cpp                    |  4 ++--
 src/TinyMqtt.h                      |  5 ++---
 tests/nowifi-tests/nowifi-tests.ino | 21 ++++++++++++---------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9465b8b..55bb629 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *~
 src/my_credentials.h
 *.o
+*.swp
 *.out
diff --git a/src/TinyMqtt.cpp b/src/TinyMqtt.cpp
index 3a95f39..4c3745a 100644
--- a/src/TinyMqtt.cpp
+++ b/src/TinyMqtt.cpp
@@ -29,8 +29,8 @@ MqttClient::MqttClient(MqttBroker* parent, WiFiClient& new_client)
 	alive = millis()+5000;	// client expires after 5s if no CONNECT msg
 }
 
-MqttClient::MqttClient(MqttBroker* parent)
-	: parent(parent)
+MqttClient::MqttClient(MqttBroker* parent, const std::string& id)
+	: parent(parent), clientId(id)
 {
 		client = nullptr;
 
diff --git a/src/TinyMqtt.h b/src/TinyMqtt.h
index 1eb23ec..23bb3ac 100644
--- a/src/TinyMqtt.h
+++ b/src/TinyMqtt.h
@@ -120,9 +120,8 @@ class MqttClient
 		FlagReserved = 1
 	};
 	public:
-		MqttClient(MqttBroker*);
-		MqttClient(MqttBroker* brk, const std::string& id) : MqttClient(brk) { clientId=id; }
-		MqttClient() : MqttClient(nullptr) {};
+		MqttClient(MqttBroker* brk = nullptr, const std::string& id="");
+		MqttClient(const std::string& id) : MqttClient(nullptr, id){}
 
 		~MqttClient();
 
diff --git a/tests/nowifi-tests/nowifi-tests.ino b/tests/nowifi-tests/nowifi-tests.ino
index 3bce9c4..b4d1cc7 100644
--- a/tests/nowifi-tests/nowifi-tests.ino
+++ b/tests/nowifi-tests/nowifi-tests.ino
@@ -3,9 +3,10 @@
 #include <map>
 
 /**
-  * TinyMqtt local unit tests.
+  * TinyMqtt nowifi unit tests.
 	*
 	* No wifi connection unit tests.
+    * Checks with a local broker. Clients must connect to the local client
 	**/
 
 using namespace std;
@@ -20,7 +21,7 @@ void onPublish(const MqttClient* srce, const Topic& topic, const char* payload,
 		published[srce->id()][topic]++;
 }
 
-test(local_client_should_unregister_when_destroyed)
+test(nowifi_client_should_unregister_when_destroyed)
 {
 	assertEqual(broker.clientsCount(), (size_t)0);
 	{
@@ -30,7 +31,7 @@ test(local_client_should_unregister_when_destroyed)
 	assertEqual(broker.clientsCount(), (size_t)0);
 }
 
-test(local_connect)
+test(nowifi_connect)
 {
 	assertEqual(broker.clientsCount(), (size_t)0);
 
@@ -39,7 +40,7 @@ test(local_connect)
 	assertEqual(broker.clientsCount(), (size_t)1);
 }
 
-test(local_publish_should_be_dispatched)
+test(nowifi_publish_should_be_dispatched)
 {
 	published.clear();
 	assertEqual(broker.clientsCount(), (size_t)0);
@@ -59,7 +60,7 @@ test(local_publish_should_be_dispatched)
 	assertTrue(published[""]["a/c"] == 2);
 }
 
-test(local_publish_should_be_dispatched_to_local_clients)
+test(nowifi_publish_should_be_dispatched_to_nowifi_clients)
 {
 	published.clear();
 	assertEqual(broker.clientsCount(), (size_t)0);
@@ -84,7 +85,7 @@ test(local_publish_should_be_dispatched_to_local_clients)
 	assertTrue(published["B"]["a/c"] == 0);
 }
 
-test(local_unsubscribe)
+test(nowifi_unsubscribe)
 {
 	published.clear();
 	assertEqual(broker.clientsCount(), (size_t)0);
@@ -104,21 +105,23 @@ test(local_unsubscribe)
 	assertTrue(published[""]["a/b"] == 1);	// Only one publish has been received
 }
 
-test(local_nocallback_when_destroyed)
+test(nowifi_nocallback_when_destroyed)
 {
 	published.clear();
 	assertEqual(broker.clientsCount(), (size_t)0);
 
+	MqttClient publisher(&broker);
+
 	{
 		MqttClient subscriber(&broker);
 		subscriber.setCallback(onPublish);
 		subscriber.subscribe("a/b");
+		publisher.publish("a/b");
 	}
 
-	MqttClient publisher(&broker);
 	publisher.publish("a/b");
 
-	assertEqual(published.size(), (size_t)0);	// Only one publish has been received
+	assertEqual(published.size(), (size_t)1);	// Only one publish has been received
 }
 
 //----------------------------------------------------------------------------