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

Merge remote-tracking branch 'origin/Ghidra_9.2'

Browse Source
This commit is contained in:
ghidra1
2020-10-26 15:30:56 -04:00
parent 9cc3f01a8b 60370df094
commit b605ad0327
25 changed files with 408 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Features/FunctionGraph/src/test/java/ghidra/app/plugin/core/functiongraph/AbstractFunctionGraphTest.java
View File

@@ -2166,12 +2166,6 @@ public abstract class AbstractFunctionGraphTest extends AbstractGhidraHeadedInte
Double scale = getGraphScale(getPrimaryGraphViewer());
int result = Double.compare(scale, 1.0);
assertEquals("Graph not fully zoomed-in; scale: " + scale, 0, result);
FGVertex v = getFocusedVertex();
Rectangle cursorBounds = v.getCursorBounds();
Window graphWindow = windowForComponent(getPrimaryGraphViewer());
Rectangle windowBounds = graphWindow.getBounds();
assertTrue(windowBounds.contains(cursorBounds));
}
protected void assertZoomedOut() {
@@ -2277,7 +2271,7 @@ public abstract class AbstractFunctionGraphTest extends AbstractGhidraHeadedInte
protected void goTo(Address address) {
GoToService goToService = tool.getService(GoToService.class);
goToService.goTo(address);
runSwing(() -> goToService.goTo(address));
waitForBusyGraph();
}

2
Ghidra/Features/FunctionGraph/src/test/java/ghidra/app/plugin/core/functiongraph/FunctionGraphPlugin1Test.java
View File

@@ -843,7 +843,7 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
private void setNavigationHistoryOption(NavigationHistoryChoices choice) throws Exception {
FGController controller = getFunctionGraphController();
FunctionGraphOptions options = controller.getFunctionGraphOptions();
setInstanceField("navigationHistoryChoice", options, choice);
runSwing(() -> setInstanceField("navigationHistoryChoice", options, choice));
waitForSwing();
}