fixup set lookup output on failure

Author: mcspr

tests/host/core/test_string.cpp

@@ -187,14 +187,14 @@ TEST_CASE("String concantenation", "[core][String]")
 TEST_CASE("String comparison", "[core][String]")
 {
     String alpha("I like fish!");
-    REQUIRE(alpha < "I like tacos!"); // compareTo()
+    REQUIRE(alpha < "I like tacos!");  // compareTo()
     REQUIRE(alpha > "I like cod!");
     REQUIRE(alpha >= "I like beef!");
     REQUIRE(alpha <= "I like soup!");
     REQUIRE(alpha.equalsIgnoreCase("i LiKe FiSh!"));
     REQUIRE(!alpha.equalsIgnoreCase("i LiKe FiSh! And ChIPs!"));
     REQUIRE(alpha.equalsConstantTime("I like fish!"));
-    REQUIRE(alpha != "I like fish?"); // equals()
+    REQUIRE(alpha != "I like fish?");  // equals()
     REQUIRE(alpha.startsWith("I like"));
     REQUIRE(!alpha.startsWith("I lick"));
     REQUIRE(alpha.startsWith("fish", 7));

tests/host/fs/test_fs.cpp

@@ -13,7 +13,7 @@
  all copies or substantial portions of the Software.
 */
 
-#include <catch.hpp>
+#include <ArduinoCatch.hpp>
 #include <map>
 #include <FS.h>
 #include "../common/spiffs_mock.h"

tests/host/fs/test_fs.inc

@@ -21,7 +21,7 @@ static std::set<String> listDir (const char* path)
     std::set<String> result;
     Dir dir = FSTYPE.openDir(path);
     while (dir.next()) {
-        REQUIRE(result.find(dir.fileName()) == std::end(result));
+        REQUIRE(!result.count(dir.fileName()));
         result.insert(dir.fileName());
     }
     return result;