Skip to content

Fix flaky testMouseMoveOpensTheToolbarForTheHoveredDiff #2963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasmelcher merged 1 commit into from
Sep 23, 2026
+4 −1
Merged

Fix flaky testMouseMoveOpensTheToolbarForTheHoveredDiff #2963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...sts/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/UnifiedDiffManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.eclipse.core.tests.resources.ResourceTestUtil.createInputStream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down Expand Up @@ -409,12 +410,14 @@ public void testMouseMoveOpensTheToolbarForTheHoveredDiff() throws BadLocationEx
int expectedLine = document().getLineOfOffset(pos.offset);

StyledText tw = viewer().getTextWidget();
Composite toolbarBefore = (Composite) tw.getData(TOOLBAR_COMPOSITE_FOR_ONE_DIFF_KEY);

fireMouseMove(tw, tw.getLinePixel(widgetLineOfModelOffset(viewer(), pos.offset)) + 2);
processEvents();

Composite toolbar = (Composite) tw.getData(TOOLBAR_COMPOSITE_FOR_ONE_DIFF_KEY);
assertNotNull(toolbar, "hovering over a diff must show its toolbar");
assertTrue(toolbar.getVisible(), "the toolbar must be made visible");
assertNotSame(toolbarBefore, toolbar, "hovering over a diff must create a new toolbar composite");
Comment thread
tobiasmelcher marked this conversation as resolved.
Annotation selected = (Annotation) toolbar.getData(CURRENT_SELECTED_UNIFIED_DIFF_ANNO_KEY);
assertNotNull(selected, "the toolbar must remember which diff it was opened for");
Position selectedPos = model.getPosition(selected);
Expand Down
Loading