From 0bd1c24b944d77f811bc009a6763ff576779bb1f Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Fri, 28 Oct 2022 11:23:26 -0400 Subject: [PATCH] GP-0 corrected test failures related to GP-2768 --- .../ghidra/app/plugin/core/memory/MemoryMapPluginTest.java | 2 +- .../app/plugin/core/memory/MemoryMapProvider1Test.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/memory/MemoryMapPluginTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/memory/MemoryMapPluginTest.java index ba83e34875..575dca04b9 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/memory/MemoryMapPluginTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/memory/MemoryMapPluginTest.java @@ -102,7 +102,7 @@ public class MemoryMapPluginTest extends AbstractGhidraHeadedIntegrationTest { String name = action.getName(); if (name.equals("Add Block") || name.equals("Set Image Base") || name.equals("Memory Map") || name.equals("Close Window") || - name.equals("Local Menu") || name.contains("Table")) { + name.contains("Table")) { assertActionEnabled(action, getActionContext(), true); } else { diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/memory/MemoryMapProvider1Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/memory/MemoryMapProvider1Test.java index fe4e1f3943..5834b119c9 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/memory/MemoryMapProvider1Test.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/memory/MemoryMapProvider1Test.java @@ -114,7 +114,7 @@ public class MemoryMapProvider1Test extends AbstractGhidraHeadedIntegrationTest table.addRowSelectionInterval(0, 0); Set actions = getActionsByOwner(tool, plugin.getName()); for (DockingActionIf action : actions) { - if (action.getName().equals("Merge Blocks")) { + if (action.getName().equals("Merge Blocks") || action.getName().equals("Local Menu")) { assertFalse(action.isEnabled()); } else { @@ -133,8 +133,7 @@ public class MemoryMapProvider1Test extends AbstractGhidraHeadedIntegrationTest String name = action.getName(); if (name.equals("Add Block") || name.equals("Merge Blocks") || name.equals("Delete Block") || name.equals("Set Image Base") || - name.equals("Memory Map") || name.equals("Close Window") || - name.equals("Local Menu")) { + name.equals("Memory Map") || name.equals("Close Window")) { assertTrue("Action should be enabled for a multi-row selection - '" + name + "'", action.isEnabled()); }