Skip to content

Commit

Permalink
fix(modem): Remove catch dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
david-cermak committed Sep 16, 2024
1 parent 1b6a3b3 commit c348076
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 30 deletions.
1 change: 0 additions & 1 deletion components/esp_modem/test/target/main/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
idf_component_register(SRCS "pppd_test.cpp"
"NetworkDCE.cpp"
INCLUDE_DIRS "$ENV{IDF_PATH}/tools/catch"
REQUIRES esp_modem)

set_target_properties(${COMPONENT_LIB} PROPERTIES
Expand Down
44 changes: 15 additions & 29 deletions components/esp_modem/test/target/main/pppd_test.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
Expand All @@ -17,9 +17,6 @@
#include "freertos/FreeRTOS.h"
#include "freertos/event_groups.h"

#define CATCH_CONFIG_MAIN
#include "catch.hpp"

static const char *TAG = "pppd_test";
static EventGroupHandle_t event_group = NULL;

Expand Down Expand Up @@ -76,6 +73,9 @@ esp_err_t modem_init_network(esp_netif_t *netif);
void modem_start_network();
void modem_stop_network();

bool test_connect();
bool test_disconnect();

extern "C" void app_main(void)
{

Expand All @@ -99,41 +99,27 @@ extern "C" void app_main(void)
#endif

modem_start_network();
Catch::Session session;
int numFailed = session.run();
if (numFailed > 0) {
ESP_LOGE(TAG, "Test FAILED!");

bool t1 = test_connect();
bool t2 = test_disconnect();

if (t1 && t2) {
ESP_LOGI(TAG, "All tests passed");
} else {
ESP_LOGI(TAG, "Test passed!");
ESP_LOGE(TAG, "Test FAILED!");
}

}

TEST_CASE("Connect test", "[esp_modem]")
bool test_connect() //("Connect test", "[esp_modem]")
{
EventBits_t b = xEventGroupWaitBits(event_group, 1, pdTRUE, pdFALSE, pdMS_TO_TICKS(15000));
CHECK(b == 1);
return b == 1;
}

TEST_CASE("Disconnection test", "[esp_modem]")
bool test_disconnect() //("Disconnection test", "[esp_modem]")
{
modem_stop_network();
EventBits_t b = xEventGroupWaitBits(event_group, 2, pdTRUE, pdFALSE, pdMS_TO_TICKS(15000));
CHECK(b == 2);
}


extern "C" {

static void handle(int nr)
{
ESP_LOGE(TAG, "Signal handler %d", nr);
}

_sig_func_ptr signal (int nr, _sig_func_ptr)
{
return handle;
}


return b == 2;
}

0 comments on commit c348076

Please sign in to comment.