Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-0: test casualties

d-millar9dbe46bee41b
diff --git a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/control/EmulatorControlMode.java b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/control/EmulatorControlMode.java
index a826a3eaf4..43eb68f45c 100644
--- a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/control/EmulatorControlMode.java
+++ b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/control/EmulatorControlMode.java
@@ -40,11 +40,13 @@ public class EmulatorControlMode extends ControlMode {
super("Default Concrete P-code Emulator",
new GIcon("icon.debugger.control.mode.rw.emulator"),
new GIcon("icon.debugger.emulate"));
+ isEditEnabled = true;
}
public EmulatorControlMode(EmulatorFactory factory) {
super(factory.getTitle(), new GIcon("icon.debugger.control.mode.rw.emulator"),
new GIcon("icon.debugger.emulate"));
+ isEditEnabled = true;
}
@Override
diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test/java/ghidra/app/plugin/core/debug/gui/control/DebuggerControlPluginTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test/java/ghidra/app/plugin/core/debug/gui/control/DebuggerControlPluginTest.java
index a64adade53..92e579ad45 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test/java/ghidra/app/plugin/core/debug/gui/control/DebuggerControlPluginTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test/java/ghidra/app/plugin/core/debug/gui/control/DebuggerControlPluginTest.java
@@ -429,8 +429,6 @@ public class DebuggerControlPluginTest extends AbstractGhidraHeadedDebuggerInteg
DebuggerDisassemblerPlugin disassemblerPlugin =
addPlugin(tool, DebuggerDisassemblerPlugin.class);
- assertFalse(controlPlugin.actionControlMode.isEnabled());
-
createAndOpenTrace();
TraceVariableSnapProgramView view = tb.trace.getProgramView();
try (Transaction tx = tb.startTransaction()) {
@@ -486,8 +484,6 @@ public class DebuggerControlPluginTest extends AbstractGhidraHeadedDebuggerInteg
DebuggerDisassemblerPlugin disassemblerPlugin =
addPlugin(tool, DebuggerDisassemblerPlugin.class);
- assertFalse(controlPlugin.actionControlMode.isEnabled());
-
createAndOpenTrace();
TraceVariableSnapProgramView view = tb.trace.getProgramView();
try (Transaction tx = tb.startTransaction()) {
@@ -547,8 +543,6 @@ public class DebuggerControlPluginTest extends AbstractGhidraHeadedDebuggerInteg
CodeViewerProvider listingProvider = listingPlugin.getProvider();
DockingActionIf pasteAction = getLocalAction(listingProvider, "Paste");
- assertFalse(controlPlugin.actionControlMode.isEnabled());
-
createAndOpenTrace();
TraceVariableSnapProgramView view = tb.trace.getProgramView();
try (Transaction tx = tb.startTransaction()) {
diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProviderTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProviderTest.java
index ea5cd225dd..8f3e87a323 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProviderTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProviderTest.java
@@ -1137,9 +1137,7 @@ public class DebuggerMemoryBytesProviderTest extends AbstractGhidraHeadedDebugge
waitForSwing();
controlService.setCurrentMode(tb.trace, ControlMode.TARGET, true);
- DockingActionIf actionEdit = getAction(memBytesPlugin, "Enable/Disable Byteviewer Editing");
- performAction(actionEdit);
goToDyn(tb.addr(0x55550800));
runSwingLater(() -> sendKeyStrokesForText("42"));
/**
@@ -1151,7 +1149,6 @@ public class DebuggerMemoryBytesProviderTest extends AbstractGhidraHeadedDebugge
*/
handleWriteMemInvocation(process, tb.addr(0x55550800), new Bytes(0x40));
handleWriteMemInvocation(process, tb.addr(0x55550800), new Bytes(0x02));
- performAction(actionEdit);
rmiCx.withdrawTarget(tool, tb.trace);
}
@@ -1180,9 +1177,7 @@ public class DebuggerMemoryBytesProviderTest extends AbstractGhidraHeadedDebugge
waitForSwing();
controlService.setCurrentMode(tb.trace, ControlMode.TRACE, true);
- DockingActionIf actionEdit = getAction(memBytesPlugin, "Enable/Disable Byteviewer Editing");
- performAction(actionEdit);
goToDyn(tb.addr(0x55550800));
runSwing(() -> sendKeyStrokesForText("42"));
@@ -1191,7 +1186,6 @@ public class DebuggerMemoryBytesProviderTest extends AbstractGhidraHeadedDebugge
assertEquals(new Bytes(0x42), data);
assertTrue(rmiMethodWriteMem.argQueue().isEmpty());
- performAction(actionEdit);
rmiCx.withdrawTarget(tool, tb.trace);
}
@@ -1224,9 +1218,7 @@ public class DebuggerMemoryBytesProviderTest extends AbstractGhidraHeadedDebugge
waitForSwing();
controlService.setCurrentMode(tb.trace, ControlMode.TARGET, true);
- DockingActionIf actionEdit = getAction(memBytesPlugin, "Enable/Disable Byteviewer Editing");
- performAction(actionEdit);
goToDyn(tb.addr(0x55550800));
Clipboard clipboard = GClipboard.getSystemClipboard();
clipboard.setContents(new StringSelection("42 53 64 75"), null);
@@ -1243,8 +1235,6 @@ public class DebuggerMemoryBytesProviderTest extends AbstractGhidraHeadedDebugge
pressButtonByText(confirm, "Yes");
handleWriteMemInvocation(process, tb.addr(0x55550800), new Bytes(0x42, 0x53, 0x64, 0x75));
- performAction(actionEdit);
-
rmiCx.withdrawTarget(tool, tb.trace);
}