From b2701c8cec777cd48cdd7660f31ef565ff7c3e01 Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 10 Oct 2025 10:55:28 -0400 Subject: [PATCH] refactor: Update Test Status Enum and Compiler Options - Changed the enum values in GetTestStatusResponse from STATUS_* to TEST_STATUS_* for consistency and clarity. - Updated corresponding references in imgui_test_harness_service.cc and gui_automation_client.cc to reflect the new enum naming. - Added /EHsc compiler option in CMakeLists.txt for MSVC to enable C++ exception handling. --- CMakeLists.txt | 1 + src/app/core/service/imgui_test_harness_service.cc | 14 +++++++------- src/cli/service/gui/gui_automation_client.cc | 12 ++++++------ src/protos/imgui_test_harness.proto | 12 ++++++------ 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f260ed59..1985a71f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -280,6 +280,7 @@ endif() # Compiler-specific settings if(MSVC) target_compile_options(yaze_common INTERFACE + /EHsc /W4 /permissive- /bigobj # Support large object files /utf-8 # Use UTF-8 encoding diff --git a/src/app/core/service/imgui_test_harness_service.cc b/src/app/core/service/imgui_test_harness_service.cc index 973e9314..d6408809 100644 --- a/src/app/core/service/imgui_test_harness_service.cc +++ b/src/app/core/service/imgui_test_harness_service.cc @@ -113,18 +113,18 @@ namespace { ::yaze::test::HarnessTestStatus status) { switch (status) { case ::yaze::test::HarnessTestStatus::kQueued: - return ::yaze::test::GetTestStatusResponse::STATUS_QUEUED; + return ::yaze::test::GetTestStatusResponse::TEST_STATUS_QUEUED; case ::yaze::test::HarnessTestStatus::kRunning: - return ::yaze::test::GetTestStatusResponse::STATUS_RUNNING; + return ::yaze::test::GetTestStatusResponse::TEST_STATUS_RUNNING; case ::yaze::test::HarnessTestStatus::kPassed: - return ::yaze::test::GetTestStatusResponse::STATUS_PASSED; + return ::yaze::test::GetTestStatusResponse::TEST_STATUS_PASSED; case ::yaze::test::HarnessTestStatus::kFailed: - return ::yaze::test::GetTestStatusResponse::STATUS_FAILED; + return ::yaze::test::GetTestStatusResponse::TEST_STATUS_FAILED; case ::yaze::test::HarnessTestStatus::kTimeout: - return ::yaze::test::GetTestStatusResponse::STATUS_TIMEOUT; + return ::yaze::test::GetTestStatusResponse::TEST_STATUS_TIMEOUT; case ::yaze::test::HarnessTestStatus::kUnspecified: default: - return ::yaze::test::GetTestStatusResponse::STATUS_UNSPECIFIED; + return ::yaze::test::GetTestStatusResponse::TEST_STATUS_UNSPECIFIED; } } @@ -1249,7 +1249,7 @@ absl::Status ImGuiTestHarnessServiceImpl::GetTestStatus( auto execution_or = test_manager_->GetHarnessTestExecution(request->test_id()); if (!execution_or.ok()) { - response->set_status(GetTestStatusResponse::STATUS_UNSPECIFIED); + response->set_status(GetTestStatusResponse::TEST_STATUS_UNSPECIFIED); response->set_error_message(std::string(execution_or.status().message())); return absl::OkStatus(); } diff --git a/src/cli/service/gui/gui_automation_client.cc b/src/cli/service/gui/gui_automation_client.cc index 88ad11b6..2562c715 100644 --- a/src/cli/service/gui/gui_automation_client.cc +++ b/src/cli/service/gui/gui_automation_client.cc @@ -55,17 +55,17 @@ TestRunStatus ConvertStatusProto( yaze::test::GetTestStatusResponse::TestStatus status) { using ProtoStatus = yaze::test::GetTestStatusResponse::TestStatus; switch (status) { - case ProtoStatus::GetTestStatusResponse_TestStatus_STATUS_QUEUED: + case ProtoStatus::GetTestStatusResponse_TestStatus_TEST_STATUS_QUEUED: return TestRunStatus::kQueued; - case ProtoStatus::GetTestStatusResponse_TestStatus_STATUS_RUNNING: + case ProtoStatus::GetTestStatusResponse_TestStatus_TEST_STATUS_RUNNING: return TestRunStatus::kRunning; - case ProtoStatus::GetTestStatusResponse_TestStatus_STATUS_PASSED: + case ProtoStatus::GetTestStatusResponse_TestStatus_TEST_STATUS_PASSED: return TestRunStatus::kPassed; - case ProtoStatus::GetTestStatusResponse_TestStatus_STATUS_FAILED: + case ProtoStatus::GetTestStatusResponse_TestStatus_TEST_STATUS_FAILED: return TestRunStatus::kFailed; - case ProtoStatus::GetTestStatusResponse_TestStatus_STATUS_TIMEOUT: + case ProtoStatus::GetTestStatusResponse_TestStatus_TEST_STATUS_TIMEOUT: return TestRunStatus::kTimeout; - case ProtoStatus::GetTestStatusResponse_TestStatus_STATUS_UNSPECIFIED: + case ProtoStatus::GetTestStatusResponse_TestStatus_TEST_STATUS_UNSPECIFIED: default: return TestRunStatus::kUnknown; } diff --git a/src/protos/imgui_test_harness.proto b/src/protos/imgui_test_harness.proto index 55408f47..082e882b 100644 --- a/src/protos/imgui_test_harness.proto +++ b/src/protos/imgui_test_harness.proto @@ -159,12 +159,12 @@ message GetTestStatusRequest { message GetTestStatusResponse { enum TestStatus { - STATUS_UNSPECIFIED = 0; // Test ID not found or unspecified - STATUS_QUEUED = 1; // Waiting to execute - STATUS_RUNNING = 2; // Currently executing - STATUS_PASSED = 3; // Completed successfully - STATUS_FAILED = 4; // Assertion failed or error - STATUS_TIMEOUT = 5; // Exceeded timeout + TEST_STATUS_UNSPECIFIED = 0; // Test ID not found or unspecified + TEST_STATUS_QUEUED = 1; // Waiting to execute + TEST_STATUS_RUNNING = 2; // Currently executing + TEST_STATUS_PASSED = 3; // Completed successfully + TEST_STATUS_FAILED = 4; // Assertion failed or error + TEST_STATUS_TIMEOUT = 5; // Exceeded timeout } TestStatus status = 1;