From 510ff514a9f551688d543d89846a2244094b8ae2 Mon Sep 17 00:00:00 2001
From: hsaturn <hsaturn.gmail.com>
Date: Sun, 4 Apr 2021 01:07:12 +0200
Subject: [PATCH] [tests] Changed assertions

---
 tests/nowifi-tests/nowifi-tests.ino            | 18 +++++++++---------
 .../string-indexer-tests.ino                   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/nowifi-tests/nowifi-tests.ino b/tests/nowifi-tests/nowifi-tests.ino
index b4d1cc7..406d777 100644
--- a/tests/nowifi-tests/nowifi-tests.ino
+++ b/tests/nowifi-tests/nowifi-tests.ino
@@ -56,8 +56,8 @@ test(nowifi_publish_should_be_dispatched)
 	publisher.publish("a/c");
 
 	assertEqual(published.size(), (size_t)1);	// 1 client has received something
-	assertTrue(published[""]["a/b"] == 1);
-	assertTrue(published[""]["a/c"] == 2);
+	assertEqual(published[""]["a/b"], 1);
+	assertEqual(published[""]["a/c"], 2);
 }
 
 test(nowifi_publish_should_be_dispatched_to_nowifi_clients)
@@ -79,10 +79,10 @@ test(nowifi_publish_should_be_dispatched_to_nowifi_clients)
 	publisher.publish("a/c");
 
 	assertEqual(published.size(), (size_t)2);	// 2 clients have received something
-	assertTrue(published["A"]["a/b"] == 1);
-	assertTrue(published["A"]["a/c"] == 1);
-	assertTrue(published["B"]["a/b"] == 1);
-	assertTrue(published["B"]["a/c"] == 0);
+	assertEqual(published["A"]["a/b"], 1);
+	assertEqual(published["A"]["a/c"], 1);
+	assertEqual(published["B"]["a/b"], 1);
+	assertEqual(published["B"]["a/c"], 0);
 }
 
 test(nowifi_unsubscribe)
@@ -95,14 +95,14 @@ test(nowifi_unsubscribe)
 	subscriber.subscribe("a/b");
 
 	MqttClient publisher(&broker);
-	publisher.publish("a/b");
+	publisher.publish("a/b");		// This publish is received
 
 	subscriber.unsubscribe("a/b");
 
-	publisher.publish("a/b");
+	publisher.publish("a/b");		// Those one, no (unsubscribed)
 	publisher.publish("a/b");
 
-	assertTrue(published[""]["a/b"] == 1);	// Only one publish has been received
+	assertEqual(published[""]["a/b"], 1);	// Only one publish has been received
 }
 
 test(nowifi_nocallback_when_destroyed)
diff --git a/tests/string-indexer-tests/string-indexer-tests.ino b/tests/string-indexer-tests/string-indexer-tests.ino
index b7d76a8..86b8df0 100644
--- a/tests/string-indexer-tests/string-indexer-tests.ino
+++ b/tests/string-indexer-tests/string-indexer-tests.ino
@@ -25,7 +25,7 @@ void onPublish(const MqttClient* srce, const Topic& topic, const char* payload,
 
 test(indexer_empty)
 {
-  assertTrue(StringIndexer::count()==0);
+  assertEqual(StringIndexer::count(), 0);
 }
 
 test(indexer_strings_deleted_should_empty_indexer)
@@ -33,15 +33,15 @@ test(indexer_strings_deleted_should_empty_indexer)
   assertTrue(StringIndexer::count()==0);
 	{
 		IndexedString one("one");
-    assertTrue(StringIndexer::count()==1);
+    assertEqual(StringIndexer::count(), 1);
 		IndexedString two("two");
-    assertTrue(StringIndexer::count()==2);
+    assertEqual(StringIndexer::count(), 2);
 		IndexedString three("three");
-    assertTrue(StringIndexer::count()==3);
+    assertEqual(StringIndexer::count(), 3);
 		IndexedString four("four");
-    assertTrue(StringIndexer::count()==4);
+    assertEqual(StringIndexer::count(), 4);
 	}
-  assertTrue(StringIndexer::count()==0);
+  assertEqual(StringIndexer::count(), 0);
 }
 
 test(indexer_same_strings_count_as_one)
@@ -51,7 +51,7 @@ test(indexer_same_strings_count_as_one)
 	IndexedString three("one");
 	IndexedString fourt("one");
 
-	assertTrue(StringIndexer::count()==1);
+	assertEqual(StringIndexer::count(), 1);
 }
 
 test(indexer_size_of_indexed_string)
@@ -81,9 +81,9 @@ test(indexer_indexed_operator_eq)
 	{
 		IndexedString same = one;
 		assertTrue(one == same);
-		assertTrue(StringIndexer::count()==1);
+		assertEqual(StringIndexer::count(), 1);
   }
-	assertTrue(StringIndexer::count()==1);
+	assertEqual(StringIndexer::count(), 1);
 }
 
 test(indexer_get_string)