Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-16 15:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-patch_Dan_testFixes-2023-07-26-1' into patch

Browse Source
This commit is contained in:
Ryan Kurtz 2023-07-26 08:37:22 -04:00
commit a84b32546f
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointsProviderTest.java
View File

@ -75,12 +75,6 @@ public class DebuggerBreakpointsProviderTest extends AbstractGhidraHeadedDebugge
breakpointService = tool.getService(DebuggerLogicalBreakpointService.class);
}
protected void waitAndFlush(TraceRecorder recorder) throws Throwable {
waitOn(recorder.getTarget().getModel().flushEvents());
waitOn(recorder.flushTransactions());
waitForDomainObject(recorder.getTrace());
}
protected void addMapping(Trace trace, Program prog) throws Exception {
try (Transaction tx = trace.openTransaction("Add mapping")) {
DebuggerStaticMappingUtils.addMapping(
@ -132,8 +126,7 @@ public class DebuggerBreakpointsProviderTest extends AbstractGhidraHeadedDebugge
Trace trace = recorder.getTrace();
addLiveMemoryAndBreakpoint(mb.testProcess1, recorder);
waitOn(mb.testModel.flushEvents());
waitForDomainObject(trace);
waitRecorder(recorder);
// NB, optionally open trace. Mapping only works if open...
traceManager.openTrace(trace);
@ -249,7 +242,7 @@ public class DebuggerBreakpointsProviderTest extends AbstractGhidraHeadedDebugge
// NOTE: This acts on the corresponding target, not directly on trace
waitOn(lb.disableForTrace(trace));
waitAndFlush(recorder);
waitRecorder(recorder);
waitForPass(() -> assertEquals(State.DISABLED, row.getState()));
@ -260,7 +253,7 @@ public class DebuggerBreakpointsProviderTest extends AbstractGhidraHeadedDebugge
// This duplicates the initial case, but without it, I just feel incomplete
waitOn(lb.enableForTrace(trace));
waitAndFlush(recorder);
waitRecorder(recorder);
waitForPass(() -> assertEquals(State.ENABLED, row.getState()));
}