TestEngine: fixed error recovery mis-asserting after a GuiFunc trigge…

…red a failed error. + TestSuite: added "misc_recover_4_table"
ocornut · Dec 20, 2024 · 42d0539 · 42d0539
1 parent 6de3d90
commit 42d0539
Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -5,6 +5,10 @@ CHANGELOG
    Those changes are not all listed here.
 ** For a while this is going to ONLY INCLUDE BREAKING CHANGES.
 
+2024/12/20:
+- TestEngine: fixed error recovery mis-asserting after a GuiFunc triggered
+  a failed error (when a test fail, error recover runs but shouldn't assert).
+
 2024/12/19:
 - TestEngine: ctx->SetVarsDataType() created blocks are zero-cleared before
   construction.

diff --git a/imgui_test_engine/imgui_te_engine.cpp b/imgui_test_engine/imgui_te_engine.cpp
@@ -1926,17 +1926,17 @@ void ImGuiTestEngine_ErrorRecoverySetup(ImGuiTestEngine* engine)
     IM_ASSERT(ctx != NULL);
     IM_ASSERT(ctx->Test != NULL);
 #if IMGUI_VERSION_NUM >= 19123
-    if (ctx->Test->Flags & ImGuiTestFlags_NoRecoveryWarnings)
+    if ((ctx->Test->Flags & ImGuiTestFlags_NoRecoveryWarnings) == 0)
     {
-        ctx->UiContext->IO.ConfigErrorRecoveryEnableAssert = false;
-        ctx->UiContext->ErrorCallback = LogAsDebugFunc;
+        ctx->UiContext->ErrorCallback = LogAsWarningFunc;
         ctx->UiContext->ErrorCallbackUserData = ctx;
     }
     else
     {
-        ctx->UiContext->ErrorCallback = LogAsWarningFunc;
+        ctx->UiContext->ErrorCallback = LogAsDebugFunc;
         ctx->UiContext->ErrorCallbackUserData = ctx;
     }
+    ctx->UiContext->IO.ConfigErrorRecoveryEnableAssert = ((ctx->Test->Flags & ImGuiTestFlags_NoRecoveryWarnings) == 0 && ctx->TestOutput->Status != ImGuiTestStatus_Error);
 #else
     IM_UNUSED(ctx);
 #endif

diff --git a/imgui_test_suite/imgui_tests_core.cpp b/imgui_test_suite/imgui_tests_core.cpp
@@ -3963,9 +3963,20 @@ void RegisterTests_Misc(ImGuiTestEngine* e)
         // Ensure we run two frames.
     };
 
+    // ## Table with scrolling are child windows
+#if IMGUI_VERSION_NUM >= 19163
+    t = IM_REGISTER_TEST(e, "misc", "misc_recover_4_table");
+    t->Flags |= ImGuiTestFlags_NoRecoveryWarnings;
+    t->GuiFunc = [](ImGuiTestContext* ctx)
+    {
+        ImGui::Begin("Test window", NULL, ImGuiWindowFlags_NoSavedSettings);
+        ImGui::BeginTable("table", 4, ImGuiTableFlags_ScrollY);
+    };
+#endif
+
     // ## Basic way for manual state record/recover
 #if IMGUI_VERSION_NUM >= 19123
-    t = IM_REGISTER_TEST(e, "misc", "misc_recover_4_midway");
+    t = IM_REGISTER_TEST(e, "misc", "misc_recover_5_midway");
     t->Flags |= ImGuiTestFlags_NoRecoveryWarnings;
     t->GuiFunc = [](ImGuiTestContext* ctx)
     {