TestSuite: amend "widgets_disabled_nested", "inputs_io_capture_on_rel…

…ease_not_owned" Didn't probably update version number at the time of committing ocornut/imgui#7640
ocornut · Jul 1, 2024 · 5b6216c · 5b6216c
1 parent 1780341
commit 5b6216c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -5,6 +5,9 @@ CHANGELOG
    Those changes are not all listed here.
 ** For a while this is going to ONLY INCLUDE BREAKING CHANGES.
 
+2024/07/01:
+- TestEngine: added helper IM_CHECK_FLOAT_NE_EPS() macro.
+
 2024/06/06:
 - TestEngine: WindowInfo() with ImGuiTestOpFlags_NoError doesn't spew error
   messages in log. (#52)

diff --git a/imgui_test_engine/imgui_te_context.h b/imgui_test_engine/imgui_te_context.h
@@ -619,6 +619,7 @@ template<> inline void ImGuiTestEngineUtil_appendf_auto(ImGuiTextBuffer* buf, Im
 
 // Floating point compares
 #define IM_CHECK_FLOAT_EQ_EPS(_LHS, _RHS)           IM_CHECK_LE(ImFabs(_LHS - (_RHS)), FLT_EPSILON)   // Float Equal
+#define IM_CHECK_FLOAT_NE_EPS(_LHS, _RHS)           IM_CHECK_GT(ImFabs(_LHS - (_RHS)), FLT_EPSILON)   // Float Not Equal
 #define IM_CHECK_FLOAT_NEAR(_LHS, _RHS, _EPS)       IM_CHECK_LE(ImFabs(_LHS - (_RHS)), _EPS)
 #define IM_CHECK_FLOAT_NEAR_NO_RET(_LHS, _RHS, _E)  IM_CHECK_LE_NO_RET(ImFabs(_LHS - (_RHS)), _E)
 

diff --git a/imgui_test_suite/imgui_tests_inputs.cpp b/imgui_test_suite/imgui_tests_inputs.cpp
@@ -59,7 +59,7 @@ void RegisterTests_Inputs(ImGuiTestEngine* e)
         IM_CHECK_EQ(g.ActiveId, 0u);
 
         ctx->MouseUp(0); // Include a yield
-#if IMGUI_BROKEN_TESTS // Test bug reported by #1392
+#if IMGUI_VERSION_NUM >= 19085 // Test bug reported by #1392
         IM_CHECK_EQ(g.IO.WantCaptureMouse, false);
 #endif
 

diff --git a/imgui_test_suite/imgui_tests_widgets.cpp b/imgui_test_suite/imgui_tests_widgets.cpp
@@ -5526,8 +5526,13 @@ void RegisterTests_Widgets(ImGuiTestEngine* e)
         IM_CHECK_FLOAT_EQ_EPS(ImGui::GetStyle().Alpha, 1.0f * 0.4f);
 
         ImGui::Begin("Nested window call");
-        IM_CHECK((g.CurrentItemFlags& ImGuiItemFlags_Disabled) == 0);
+#if IMGUI_VERSION_NUM >= 19085
+        IM_CHECK((g.CurrentItemFlags & ImGuiItemFlags_Disabled) != 0);
+        IM_CHECK_FLOAT_NE_EPS(ImGui::GetStyle().Alpha, 1.0f);
+#else
+        IM_CHECK((g.CurrentItemFlags & ImGuiItemFlags_Disabled) == 0);
         IM_CHECK_FLOAT_EQ_EPS(ImGui::GetStyle().Alpha, 1.0f);
+#endif
 
         ImGui::End();
         IM_CHECK((g.CurrentItemFlags & ImGuiItemFlags_Disabled) != 0);