Skip to content

Commit c252f63

Browse files
committed
Repair and execute MenuItemTest.test_addSelectionListener
Replace Mockito with normal stubbing.
1 parent 88fe1bf commit c252f63

1 file changed

Lines changed: 10 additions & 14 deletions

File tree

  • org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu

org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuItemTest.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,10 @@
2828

2929
import org.eclipse.swt.SWT;
3030

31-
import static org.mockito.Mockito.mock;
32-
import static org.mockito.Mockito.verify;
33-
import static org.mockito.Mockito.verifyNoMoreInteractions;
34-
35-
import org.junit.jupiter.api.Disabled;
3631
import org.junit.jupiter.api.Test;
37-
import org.mockito.ArgumentMatchers;
3832

3933
import java.util.List;
34+
import java.util.concurrent.atomic.AtomicInteger;
4035

4136
/**
4237
* Tests for {@link MenuItemInfo}.
@@ -477,7 +472,6 @@ public Test() {
477472
/**
478473
* Test adding a selection listener to menu item.
479474
*/
480-
@Disabled
481475
@Test
482476
public void test_addSelectionListener() throws Exception {
483477
CompositeInfo shell = parseComposite("""
@@ -497,18 +491,20 @@ public Test() {
497491
MenuInfo menuBar = shell.getChildren(MenuInfo.class).get(0);
498492
MenuItemInfo menuItem = menuBar.getChildrenItems().get(0);
499493
// set mock for DesignPageSite
500-
IDesignPageSite pageSite;
501-
{
502-
pageSite = mock(IDesignPageSite.class);
503-
DesignPageSite.Helper.setSite(shell, pageSite);
504-
}
494+
AtomicInteger sourcePosition = new AtomicInteger();
495+
IDesignPageSite pageSite = new DesignPageSite() {
496+
@Override
497+
public void openSourcePosition(int position) {
498+
sourcePosition.set(position);
499+
}
500+
};
501+
DesignPageSite.Helper.setSite(shell, pageSite);
505502
// add selection listener
506503
EventsProperty eventsProperty = (EventsProperty) menuItem.getPropertyByTitle("Events");
507504
eventsProperty.openStubMethod("selection/widgetSelected");
508505
waitEventLoop(0);
509506
// test results
510-
verify(pageSite).openSourcePosition(ArgumentMatchers.anyInt());
511-
verifyNoMoreInteractions(pageSite);
507+
assertEquals(696, sourcePosition.get());
512508
assertEditor("""
513509
public class Test extends Shell {
514510
public Test() {

0 commit comments

Comments
 (0)