From 76675c79fb76a3078bbbe7dbff8ffd05d7061e56 Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 11 Jul 2024 16:27:10 +0200 Subject: [PATCH] update test data for api3 --- src/test/test.cpp | 42 ++++++++++++++++++++++++++++++++++++------ src/test/test.h | 2 +- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/test/test.cpp b/src/test/test.cpp index 23cab6c34..241e88b4a 100644 --- a/src/test/test.cpp +++ b/src/test/test.cpp @@ -315,7 +315,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const shell.printfln("Testing adding a boiler, thermostat, all sensors, scheduler and custom entities..."); // setup fake data - EMSESP::webCustomizationService.test(); // set customizations - this will overwrite any settings in the file + EMSESP::webCustomizationService.test(); // set customizations - this will overwrite any settings in the FS // add devices test("general"); @@ -972,6 +972,8 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const EMSESP::webAPIService.webAPIService(&request); request.url("/api/boiler/flamecurr/value"); EMSESP::webAPIService.webAPIService(&request); + + // This should fail request.url("/api/boiler/flamecurr/bad"); EMSESP::webAPIService.webAPIService(&request); @@ -1017,12 +1019,15 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const } if (command == "api3") { - shell.printfln("Testing API getting values"); + shell.printfln("Testing API getting values from system"); EMSESP::system_.bool_format(BOOL_FORMAT_TRUEFALSE); // BOOL_FORMAT_TRUEFALSE_STR - // test("boiler"); + test("boiler"); // test("thermostat"); + EMSESP::temperaturesensor_.test(); // add temperature sensors + EMSESP::webSchedulerService.test(); // add scheduler items + AsyncWebServerRequest request; JsonDocument doc; JsonVariant json; @@ -1031,13 +1036,38 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const request.url("/api/system"); EMSESP::webAPIService.webAPIService(&request); - request.url("/api/system/locale"); + request.url("/api/system/settings/locale"); EMSESP::webAPIService.webAPIService(&request); - request.url("/api/system/locale/value"); + request.url("/api/boiler/comfort"); EMSESP::webAPIService.webAPIService(&request); - shell.invoke_command("call system locale"); + request.url("/api/boiler/comfort/value"); + EMSESP::webAPIService.webAPIService(&request); + + request.url("/api/scheduler/info"); + EMSESP::webAPIService.webAPIService(&request); + + request.url("/api/scheduler/test_scheduler"); + EMSESP::webAPIService.webAPIService(&request); + + // This next lot should all fail + + request.url("/api/system/settings/locale2"); + EMSESP::webAPIService.webAPIService(&request); + + // API failed with error unknown device (Error) + request.url("/api/boiler2/bad"); + EMSESP::webAPIService.webAPIService(&request); + + request.url("/api/boiler/bad"); + EMSESP::webAPIService.webAPIService(&request); + + request.url("/api/boiler/bad/value"); + EMSESP::webAPIService.webAPIService(&request); + + request.url("/api/scheduler/test_scheduler2"); + EMSESP::webAPIService.webAPIService(&request); ok = true; } diff --git a/src/test/test.h b/src/test/test.h index 17d4b0005..4bb6a9e86 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -42,7 +42,7 @@ namespace emsesp { // #define EMSESP_DEBUG_DEFAULT "render" // #define EMSESP_DEBUG_DEFAULT "api" // #define EMSESP_DEBUG_DEFAULT "api2" -// #define EMSESP_DEBUG_DEFAULT "api3" +#define EMSESP_DEBUG_DEFAULT "api3" // #define EMSESP_DEBUG_DEFAULT "crash" // #define EMSESP_DEBUG_DEFAULT "dv" // #define EMSESP_DEBUG_DEFAULT "lastcode"