Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-22 04:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests - fix for timing issue in midday

Browse Source
This commit is contained in:
dragonmacher 2019-04-23 14:50:06 -04:00
parent 70bc692900
commit 6805e36527
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,6 @@ import edu.uci.ics.jung.visualization.util.Caching;
import generic.test.TestUtils;
import ghidra.app.cmd.label.AddLabelCmd;
import ghidra.app.events.ProgramSelectionPluginEvent;
import ghidra.app.plugin.core.codebrowser.CodeBrowserPlugin;
import ghidra.app.plugin.core.colorizer.ColorizingPlugin;
import ghidra.app.plugin.core.colorizer.ColorizingService;
import ghidra.app.plugin.core.functiongraph.graph.*;
@ -670,8 +669,9 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
// we must 'fake out' the listing to generate a location event from within the listing
pressRightArrowKey(otherVertex);
waitForSwing();
ProgramLocation codeBrowserLocation = codeBrowser.getCurrentLocation();
ProgramLocation codeBrowserLocation = runSwing(() -> codeBrowser.getCurrentLocation());
ProgramLocation actualVertexLocation = otherVertex.getProgramLocation();
assertEquals(newVertexLocation.getAddress(), actualVertexLocation.getAddress());
assertEquals(actualVertexLocation.getAddress(), codeBrowserLocation.getAddress());
@ -784,8 +784,8 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
assertNotNull(newGraphData);
assertTrue("Unexpectedly received an empty FunctionGraphData", newGraphData.hasResults());
graph = newGraphData.getFunctionGraph();
FGVertex newRootVertex = graph.getRootVertex();
FunctionGraph newGraph = newGraphData.getFunctionGraph();
FGVertex newRootVertex = newGraph.getRootVertex();
assertNotNull(newRootVertex);
waitForSwing();
@ -800,10 +800,10 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
pointsAreSimilar(originalPoint, reloadedPoint));
// make sure the CodeBrowser's location matches ours
FGVertex focusedVertex = graph.getFocusedVertex();
FGVertex focusedVertex = runSwing(() -> newGraph.getFocusedVertex());
ProgramLocation graphLocation = focusedVertex.getProgramLocation();
CodeBrowserPlugin codeBrowserPlugin = env.getPlugin(CodeBrowserPlugin.class);
ProgramLocation codeBrowserLocation = codeBrowserPlugin.getCurrentLocation();
ProgramLocation codeBrowserLocation = runSwing(() -> codeBrowser.getCurrentLocation());
assertEquals(graphLocation.getAddress(), codeBrowserLocation.getAddress());
}
}