Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev

src/command.cpp

@@ -418,7 +418,7 @@ uint8_t Command::call(const uint8_t device_type, const char * command, const cha
         LOG_WARNING(error);
     } else {
         if (single_command) {
-            // log as DEBUG (TRACE) regarless if compiled with EMSESP_DEBUG
+            // log as DEBUG (TRACE) regardless if compiled with EMSESP_DEBUG
             logger_.debug(("%sCalled command %s"), ro.c_str(), info_s);
         } else {
             if (id > 0) {

src/console.cpp

@@ -691,11 +691,16 @@ std::string EMSESPShell::context_text() {
 
 // when in su (admin) show # as the prompt suffix
 std::string EMSESPShell::prompt_suffix() {
+#ifndef EMSESP_UNITY
     if (has_flags(CommandFlags::ADMIN)) {
         return std::string{'#'};
     } else {
         return std::string{'$'};
     }
+#else
+    // don't bother with prompt suffix if we're testing Unity output
+    return "";
+#endif
 }
 
 void EMSESPShell::end_of_transmission() {

src/emsesp.cpp

@@ -1554,8 +1554,6 @@ void EMSESP::start() {
 #if defined(EMSESP_STANDALONE)
     shell_->add_flags(CommandFlags::ADMIN); // always start in su/admin mode when running tests
 #endif
-#else
-#warning "Shell is disabled when running Unity tests."
 #endif
 
 // start the file system

src/system.cpp

@@ -1396,8 +1396,13 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
     JsonObject node;
 
     // System
-    node              = output["system"].to<JsonObject>();
-    node["version"]   = EMSESP_APP_VERSION;
+    node = output["system"].to<JsonObject>();
+// prevent false negataive in Unity tests everytime the version changes
+#if defined(EMSESP_UNITY)
+    node["version"] = "dev";
+#else
+    node["version"] = EMSESP_APP_VERSION;
+#endif
     node["uptime"]    = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3);
     node["uptimeSec"] = uuid::get_uptime_sec();
 #ifndef EMSESP_STANDALONE

src/test/test.cpp

@@ -1109,6 +1109,8 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
             Serial.println();
             Serial.printf("%s**** Testing bad urls ****\n%s", COLOR_RED, COLOR_RESET);
 
+            request.method(HTTP_GET);
+
             request.url("/api/boiler2");
             EMSESP::webAPIService.webAPIService(&request);
 

src/version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.7.0-dev.30"
+#define EMSESP_APP_VERSION "3.7.0-dev.31"

src/web/WebAPIService.cpp

@@ -134,7 +134,7 @@ void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject input) {
     const char * api_data = output["api_data"];
     if (api_data) {
         request->send(200, "text/plain; charset=utf-8", api_data);
-#if defined(EMSESP_TEST)
+#if defined(EMSESP_UNITY)
         // store the result so we can test with Unity later
         storeResponse(output);
 #endif
@@ -161,7 +161,7 @@ void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject input) {
     request->send(response);
     api_count_++;
 
-#if defined(EMSESP_TEST)
+#if defined(EMSESP_UNITY)
     // store the result so we can test with Unity later
     storeResponse(output);
 #endif
@@ -229,7 +229,7 @@ void WebAPIService::getEntities(AsyncWebServerRequest * request) {
     request->send(response);
 }
 
-#if defined(EMSESP_TEST)
+#if defined(EMSESP_UNITY)
 // store the result so we can test with Unity later
 static JsonDocument storeResponseDoc_;
 

src/web/WebCustomizationService.cpp

@@ -210,7 +210,7 @@ void WebCustomizationService::device_entities(AsyncWebServerRequest * request) {
 #endif
 #if defined(EMSESP_DEBUG)
                 size_t length = response->setLength();
-                EMSESP::logger().debug("Customization buffer used: %d", length);
+                EMSESP::logger().debug("Customizations buffer used: %d", length);
 #else
                 response->setLength();
 #endif