development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-08-28 05:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2022-10-04'

Browse source
This commit is contained in:
Ryan Kurtz 2022-10-05 00:39:53 -04:00
parent f7bb9e9e43 a726a3d706
commit 42566bceaf
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java
View file

@ -590,7 +590,7 @@ public class DebuggerListingProvider extends CodeViewerProvider {
@Override @Override
protected void doSetProgram(Program newProgram) { protected void doSetProgram(Program newProgram) {
if (newProgram != null && newProgram != current.getView()) { if (newProgram != null && current.getView() != null && newProgram != current.getView()) {
throw new AssertionError(); throw new AssertionError();
} }
if (getProgram() == newProgram) { if (getProgram() == newProgram) {

2
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProviderTest.java
View file

@ -310,7 +310,7 @@ public class DebuggerMemoryBytesProviderTest extends AbstractGhidraHeadedDebugge
runSwing(() -> memBytesProvider.setTrackingSpec(SPLocationTrackingSpec.INSTANCE)); runSwing(() -> memBytesProvider.setTrackingSpec(SPLocationTrackingSpec.INSTANCE));
ProgramLocation loc = memBytesProvider.getLocation(); ProgramLocation loc = waitForValue(() -> memBytesProvider.getLocation());
assertEquals(tb.trace.getProgramView(), loc.getProgram()); assertEquals(tb.trace.getProgramView(), loc.getProgram());
assertEquals(tb.addr(0x01fff800), loc.getAddress()); assertEquals(tb.addr(0x01fff800), loc.getAddress());
} }

9
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/pcode/DebuggerPcodeStepperProviderTest.java
View file

@ -24,6 +24,7 @@ import org.junit.Test;
import com.google.common.collect.Range; import com.google.common.collect.Range;
import generic.Unique;
import ghidra.app.plugin.assembler.Assembler; import ghidra.app.plugin.assembler.Assembler;
import ghidra.app.plugin.assembler.Assemblers; import ghidra.app.plugin.assembler.Assemblers;
import ghidra.app.plugin.core.debug.gui.AbstractGhidraHeadedDebuggerGUITest; import ghidra.app.plugin.core.debug.gui.AbstractGhidraHeadedDebuggerGUITest;
@ -100,6 +101,12 @@ public class DebuggerPcodeStepperProviderTest extends AbstractGhidraHeadedDebugg
assertTrue(pcodeProvider.uniqueTableModel.getModelData().isEmpty()); assertTrue(pcodeProvider.uniqueTableModel.getModelData().isEmpty());
} }
protected void assertDecodeStep() {
PcodeRow row = Unique.assertOne(pcodeProvider.pcodeTableModel.getModelData());
assertEquals(EnumPcodeRow.DECODE, row);
assertTrue(pcodeProvider.uniqueTableModel.getModelData().isEmpty());
}
protected void assertPopulated() { protected void assertPopulated() {
assertFalse(pcodeProvider.pcodeTableModel.getModelData().isEmpty()); assertFalse(pcodeProvider.pcodeTableModel.getModelData().isEmpty());
// NB. I don't know what uniques, if any, are involved // NB. I don't know what uniques, if any, are involved
@ -117,7 +124,7 @@ public class DebuggerPcodeStepperProviderTest extends AbstractGhidraHeadedDebugg
TraceSchedule schedule1 = TraceSchedule.parse("0:.t0-1"); TraceSchedule schedule1 = TraceSchedule.parse("0:.t0-1");
traceManager.openTrace(tb.trace); traceManager.openTrace(tb.trace);
traceManager.activateThread(thread); traceManager.activateThread(thread);
assertEmpty(); waitForPass(() -> assertDecodeStep());
traceManager.activateTime(schedule1); traceManager.activateTime(schedule1);
waitForPass(() -> assertEquals(schedule1, pcodeProvider.current.getTime())); waitForPass(() -> assertEquals(schedule1, pcodeProvider.current.getTime()));