fix test cases

Author: matth-x

CMakeLists.txt

@@ -145,10 +145,10 @@ set(MO_SRC_UNIT
     #tests/Configuration.cpp
     #tests/Reservation.cpp
     #tests/Reset.cpp
-    #tests/LocalAuthList.cpp
+    tests/LocalAuthList.cpp
     #tests/Variables.cpp
     #tests/Transactions.cpp
-    #tests/Certificates.cpp
+    tests/Certificates.cpp
     #tests/FirmwareManagement.cpp
     #tests/ChargePointError.cpp
     #tests/Boot.cpp
@@ -196,6 +196,7 @@ target_compile_definitions(mo_unit_tests PUBLIC
     MO_MaxChargingProfilesInstalled=3
     MO_ENABLE_CERT_MGMT=1
     MO_ENABLE_CONNECTOR_LOCK=1
+    MO_ENABLE_DIAGNOSTICS=0
     MO_REPORT_NOERROR=1
     MO_ENABLE_V201=1
     MO_OVERRIDE_ALLOCATION=1

src/MicroOcpp/Core/FilesystemUtils.h

@@ -60,7 +60,9 @@ enum class StoreStatus : uint8_t {
 StoreStatus storeJson(MO_FilesystemAdapter *filesystem, const char *fname, const JsonDoc& doc);
 
 /*
- * Removes files in the MO folder whose file names start with `fnamePrefix`.
+ * Removes files in the MO folder whose file names start with `fnamePrefix`. Returns false if there
+ * was an error deleting a file. Returns true if the files were deleted successfully, or there was
+ * no file to delete
  */
 bool removeByPrefix(MO_FilesystemAdapter *filesystem, const char *fnamePrefix);
 

src/MicroOcpp/Core/MessageService.cpp

@@ -279,6 +279,13 @@ bool MessageService::setOnSendConf(const char *operationType, void (*onConfirmat
     return appendEntry(sendConfListeners, listener);
 }
 
+void MessageService::clearRegisteredOperation(const char *operationType) {
+    removeEntry(operationRegistry, operationType);
+    removeEntry(operationRegistry2, operationType);
+    removeEntry(receiveRequestListeners, operationType);
+    removeEntry(sendConfListeners, operationType);
+}
+
 std::unique_ptr<Request> MessageService::createRequest(const char *operationType) {
 
     Operation *operation = nullptr;

src/MicroOcpp/Core/MessageService.h

@@ -72,6 +72,12 @@ class MessageService : public MemoryManaged {
 public:
     MessageService(Context& context);
 
+    // handle Requests from the OCPP Server
+    bool registerOperation(const char *operationType, Operation* (*createOperationCb)(Context& context));
+    bool registerOperation(const char *operationType, void (*onRequest)(const char *operationType, const char *payloadJson, void **userStatus, void *userData), int (*writeResponse)(const char *operationType, char *buf, size_t size, void *userStatus, void *userData), void (*finally)(const char *operationType, void *userStatus, void *userData) = nullptr, void *userData = nullptr);
+    bool setOnReceiveRequest(const char *operationType, void (*onRequest)(const char *operationType, const char *payloadJson, void *userData), void *userData = nullptr);
+    bool setOnSendConf(const char *operationType, void (*onConfirmation)(const char *operationType, const char *payloadJson, void *userData), void *userData = nullptr);
+
     bool setup();
 
     void loop(); //polls all reqQueues and decides which request to send (if any)
@@ -80,15 +86,14 @@ class MessageService : public MemoryManaged {
     bool sendRequest(std::unique_ptr<Request> request); //send an OCPP operation request to the server; adds request to default queue
     bool sendRequestPreBoot(std::unique_ptr<Request> request); //send an OCPP operation request to the server; adds request to preBootQueue
 
-    // handle Requests from the OCPP Server
-    bool registerOperation(const char *operationType, Operation* (*createOperationCb)(Context& context));
-    bool registerOperation(const char *operationType, void (*onRequest)(const char *operationType, const char *payloadJson, void **userStatus, void *userData), int (*writeResponse)(const char *operationType, char *buf, size_t size, void *userStatus, void *userData), void (*finally)(const char *operationType, void *userStatus, void *userData) = nullptr, void *userData = nullptr);
-    bool setOnReceiveRequest(const char *operationType, void (*onRequest)(const char *operationType, const char *payloadJson, void *userData), void *userData = nullptr);
-    bool setOnSendConf(const char *operationType, void (*onConfirmation)(const char *operationType, const char *payloadJson, void *userData), void *userData = nullptr);
-
     // process message from server ("message" = serialized Request or Confirmation)
     bool receiveMessage(const char* payload, size_t length);
 
+    // Undo `registerOperation()`, `setOnReceiveRequest()` and `setOnSendConf()` for specific operation type.
+    // Necessary to re-register different operation handler after `mo_setup()`. MO will clear all registered
+    // handlers during `mo_deinitialize()` automatically.
+    void clearRegisteredOperation(const char *operationType);
+
     // Outgoing Requests are handled in separate queues.
     void addSendQueue(RequestQueue* sendQueue);
     void setPreBootSendQueue(VolatileRequestQueue *preBootQueue);

src/MicroOcpp/Model/Availability/AvailabilityService.cpp

@@ -155,7 +155,6 @@ void v16::AvailabilityServiceEvse::loop() {
             MO_DBG_ERR("OOM");
             return;
         }
-        statusNotification->setTimeout(0);
         context.getMessageService().sendRequest(std::move(statusNotification));
         return;
     }
@@ -451,7 +450,6 @@ void v201::AvailabilityServiceEvse::loop() {
                 context.getClock().now().isUnixTime()) {
 
             auto statusNotification = makeRequest(context, new StatusNotification(context, evseId, status, context.getClock().now()));
-            statusNotification->setTimeout(0);
             context.getMessageService().sendRequest(std::move(statusNotification));
             reportedStatus = status;
             return;

src/MicroOcpp/Model/Diagnostics/DiagnosticsService.cpp

@@ -1006,8 +1006,6 @@ void DiagnosticsService::setFtpServerCert(const char *cert) {
 
 } //namespace MicroOcpp
 
-#endif //(MO_ENABLE_V16 || MO_ENABLE_V201) && MO_ENABLE_DIAGNOSTICS
-
 #if MO_USE_DIAGNOSTICS == MO_DIAGNOSTICS_BUILTIN_MBEDTLS_ESP32
 
 #include "esp_heap_caps.h"
@@ -1049,3 +1047,5 @@ void defaultDiagnosticsOnClose(void*) {
 } //namespace MicroOcpp
 
 #endif //MO_USE_DIAGNOSTICS
+
+#endif //(MO_ENABLE_V16 || MO_ENABLE_V201) && MO_ENABLE_DIAGNOSTICS

src/MicroOcpp/Model/Model.cpp

@@ -271,13 +271,15 @@ void v16::Model::updateSupportedStandardProfiles() {
         }
     }
 
+#if MO_ENABLE_FIRMWAREMANAGEMENT && MO_ENABLE_DIAGNOSTICS
     if (firmwareService ||
             getDiagnosticsService()) {
         if (!strstr(supportedFeatureProfilesString->getString(), "FirmwareManagement")) {
             if (!buf.empty()) buf += ',';
             buf += "FirmwareManagement";
         }
     }
+#endif //MO_ENABLE_FIRMWAREMANAGEMENT && MO_ENABLE_DIAGNOSTICS
 
 #if MO_ENABLE_LOCAL_AUTH
     if (authorizationService) {