mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-0: Fix tests.

Browse Source
This commit is contained in:
Dan
2023-11-15 10:12:46 -05:00
parent 63b1fb833a
commit 429e88ae40
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/tracemgr/DebuggerTraceManagerServiceTest.java
View File

@@ -25,18 +25,19 @@ import org.junit.experimental.categories.Category;
import db.Transaction; import db.Transaction;
import generic.test.category.NightlyCategory; import generic.test.category.NightlyCategory;
import generic.test.rule.Repeated;
import ghidra.app.plugin.core.debug.gui.AbstractGhidraHeadedDebuggerTest; import ghidra.app.plugin.core.debug.gui.AbstractGhidraHeadedDebuggerTest;
import ghidra.app.plugin.core.debug.service.control.DebuggerControlServicePlugin; import ghidra.app.plugin.core.debug.service.control.DebuggerControlServicePlugin;
import ghidra.app.services.*; import ghidra.app.services.DebuggerControlService;
import ghidra.dbg.model.TestTargetStack; import ghidra.dbg.model.TestTargetStack;
import ghidra.dbg.model.TestTargetStackFrameHasRegisterBank; import ghidra.dbg.model.TestTargetStackFrameHasRegisterBank;
import ghidra.dbg.target.schema.SchemaContext; import ghidra.dbg.target.schema.SchemaContext;
import ghidra.dbg.target.schema.TargetObjectSchema.SchemaName; import ghidra.dbg.target.schema.TargetObjectSchema.SchemaName;
import ghidra.dbg.target.schema.XmlSchemaContext;
import ghidra.debug.api.action.ActionSource; import ghidra.debug.api.action.ActionSource;
import ghidra.debug.api.control.ControlMode; import ghidra.debug.api.control.ControlMode;
import ghidra.debug.api.model.TraceRecorder; import ghidra.debug.api.model.TraceRecorder;
import ghidra.debug.api.tracemgr.DebuggerCoordinates; import ghidra.debug.api.tracemgr.DebuggerCoordinates;
import ghidra.dbg.target.schema.XmlSchemaContext;
import ghidra.framework.model.DomainFile; import ghidra.framework.model.DomainFile;
import ghidra.trace.database.target.DBTraceObjectManager; import ghidra.trace.database.target.DBTraceObjectManager;
import ghidra.trace.database.target.DBTraceObjectManagerTest; import ghidra.trace.database.target.DBTraceObjectManagerTest;
@@ -240,6 +241,8 @@ public class DebuggerTraceManagerServiceTest extends AbstractGhidraHeadedDebugge
objThread0 = objThread0 =
objectManager.createObject(TraceObjectKeyPath.parse("Targets[0].Threads[0]")); objectManager.createObject(TraceObjectKeyPath.parse("Targets[0].Threads[0]"));
} }
// Manager listens for the root-created event to activate it. Wait for it to clear.
waitForDomainObject(tb.trace);
TraceThread thread = TraceThread thread =
Objects.requireNonNull(objThread0.queryInterface(TraceObjectThread.class)); Objects.requireNonNull(objThread0.queryInterface(TraceObjectThread.class));

2
Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbCommandsTest.java
View File

@@ -1065,6 +1065,7 @@ public class LldbCommandsTest extends AbstractLldbTraceRmiTest {
.getValuePaths(Lifespan.at(0), .getValuePaths(Lifespan.at(0),
PathPredicates.parse("Processes[].Breakpoints[]")) PathPredicates.parse("Processes[].Breakpoints[]"))
.map(p -> p.getLastEntry()) .map(p -> p.getLastEntry())
.sorted(Comparator.comparing(TraceObjectValue::getEntryKey))
.toList(); .toList();
assertEquals(2, procBreakLocVals.size()); assertEquals(2, procBreakLocVals.size());
AddressRange rangeMain = AddressRange rangeMain =
@@ -1103,6 +1104,7 @@ public class LldbCommandsTest extends AbstractLldbTraceRmiTest {
.getValuePaths(Lifespan.at(0), .getValuePaths(Lifespan.at(0),
PathPredicates.parse("Processes[].Watchpoints[]")) PathPredicates.parse("Processes[].Watchpoints[]"))
.map(p -> p.getLastEntry()) .map(p -> p.getLastEntry())
.sorted(Comparator.comparing(TraceObjectValue::getEntryKey))
.toList(); .toList();
assertEquals(3, procWatchLocVals.size()); assertEquals(3, procWatchLocVals.size());
AddressRange rangeMain0 = AddressRange rangeMain0 =

2
Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbMethodsTest.java
View File

@@ -111,6 +111,7 @@ public class LldbMethodsTest extends AbstractLldbTraceRmiTest {
.getValuePaths(Lifespan.at(0), .getValuePaths(Lifespan.at(0),
PathPredicates.parse("Processes[].Breakpoints[]")) PathPredicates.parse("Processes[].Breakpoints[]"))
.map(p -> p.getLastEntry()) .map(p -> p.getLastEntry())
.sorted(Comparator.comparing(TraceObjectValue::getEntryKey))
.toList(); .toList();
assertEquals(2, procBreakLocVals.size()); assertEquals(2, procBreakLocVals.size());
AddressRange rangeMain = AddressRange rangeMain =
@@ -150,6 +151,7 @@ public class LldbMethodsTest extends AbstractLldbTraceRmiTest {
.getValuePaths(Lifespan.at(0), .getValuePaths(Lifespan.at(0),
PathPredicates.parse("Processes[].Breakpoints[]")) PathPredicates.parse("Processes[].Breakpoints[]"))
.map(p -> p.getLastEntry()) .map(p -> p.getLastEntry())
.sorted(Comparator.comparing(TraceObjectValue::getEntryKey))
.toList(); .toList();
assertEquals(2, procBreakLocVals.size()); assertEquals(2, procBreakLocVals.size());
AddressRange rangeMain = AddressRange rangeMain =