GT-2960 - Docking Actions - review fixes; test fixes

This commit is contained in:
dragonmacher 2019-07-31 16:55:46 -04:00
parent d8c234d5d0
commit e6a85f9b1b
7 changed files with 26 additions and 14 deletions

View file

@ -44,7 +44,7 @@ public class ComponentProviderActionsTest extends AbstractGhidraHeadedIntegratio
private final Icon ICON = ResourceManager.loadImage("images/refresh.png");
private static final String PROVIDER_NAME = "Test Action Provider";
private static final KeyStroke CONTROL_T =
KeyStroke.getKeyStroke(Character.valueOf('T'), DockingUtils.CONTROL_KEY_MODIFIER_MASK);
KeyStroke.getKeyStroke(KeyEvent.VK_T, DockingUtils.CONTROL_KEY_MODIFIER_MASK);
private TestEnv env;
private PluginTool tool;
@ -453,8 +453,12 @@ public class ComponentProviderActionsTest extends AbstractGhidraHeadedIntegratio
}
private void assertProviderIsActive() {
assertTrue("The test provider is not showing and focused",
runSwing(() -> tool.isActive(provider)));
assertTrue("Component provider is not showing", runSwing(() -> tool.isVisible(provider)));
// note: we can't call 'isActive()' due to focus issues in parallel testing
//assertTrue("The test provider is not showing and focused",
// runSwing(() -> tool.isActive(provider)));
}
private void assertProviderIsHidden() {