mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/mqtt_ping_timer_restart' into 'master' 

[MQTT] - Adds esp-timer as dependency and update esp_mqtt.

See merge request espressif/esp-idf!18409
pull/9357/head
David Čermák 2022-07-05 22:01:32 +08:00
rodzic 8417079218 33fccf6405
commit 53b9213757
5 zmienionych plików z 13 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
components/mqtt/CMakeLists.txt
Wyświetl plik

@ -3,7 +3,9 @@ idf_component_register(SRCS "esp-mqtt/mqtt_client.c"
"esp-mqtt/lib/mqtt_outbox.c"
"esp-mqtt/lib/platform_esp32_idf.c"
INCLUDE_DIRS esp-mqtt/include
PRIV_INCLUDE_DIRS "esp-mqtt/lib/include")
PRIV_INCLUDE_DIRS "esp-mqtt/lib/include"
PRIV_REQUIRES esp_timer
)
if(TEST_BUILD)
message(STATUS "building MOCKS")

2
components/mqtt/esp-mqtt

@ -1 +1 @@
Subproject commit a21c387d6280260894981c22494017c893d505b9
Subproject commit 89e5c6014f8dbcfcd98af35fb507ca7b96ac8aee

4
components/mqtt/host_test/CMakeLists.txt
Wyświetl plik

@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.16)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
set(COMPONENTS main)
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/mocks/freertos/")
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/mocks/freertos/"
"$ENV{IDF_PATH}/tools/mocks/esp_timer/"
)
option(TEST_BUILD "" ON)
project(host_mqtt_client_test)

2
components/mqtt/host_test/main/CMakeLists.txt
Wyświetl plik

@ -1,3 +1,3 @@
idf_component_register(SRCS "test_mqtt_client.cpp"
INCLUDE_DIRS "$ENV{IDF_PATH}/tools/catch"
REQUIRES cmock mqtt)
REQUIRES cmock mqtt esp_timer)

8
components/mqtt/host_test/main/test_mqtt_client.cpp
Wyświetl plik

@ -13,6 +13,7 @@ extern "C" {
#include "Mockhttp_parser.h"
#include "Mockqueue.h"
#include "Mocktask.h"
#include "Mockesp_timer.h"
/*
* The following functions are not directly called but the generation of them
@ -30,15 +31,16 @@ struct ClientInitializedFixture {
esp_mqtt_client_handle_t client;
ClientInitializedFixture()
{
TEST_PROTECT();
[[maybe_unused]] auto protect = TEST_PROTECT();
int mtx;
int transport_list;
int transport;
int event_group;
uint8_t mac[] = {0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55};
esp_log_write_Ignore();
xQueueTakeMutexRecursive_CMockIgnoreAndReturn(0, true);
xQueueGiveMutexRecursive_CMockIgnoreAndReturn(0, true);
esp_timer_get_time_IgnoreAndReturn(0);
xQueueTakeMutexRecursive_IgnoreAndReturn(true);
xQueueGiveMutexRecursive_IgnoreAndReturn(true);
xQueueCreateMutex_ExpectAnyArgsAndReturn(
reinterpret_cast<QueueHandle_t>(&mtx));
xEventGroupCreate_IgnoreAndReturn(reinterpret_cast<EventGroupHandle_t>(&event_group));