Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-22 10:02:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed test failing due to inconsistent history state between tests

Browse Source
This commit is contained in:
dragonmacher
2020-03-13 17:49:08 -04:00
parent 69c3437e1e
commit 5c5e5588e4
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/FunctionGraph/src/test/java/ghidra/app/plugin/core/functiongraph/FunctionGraphPlugin1Test.java
+15 -16
View File
@@ -590,7 +590,7 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
Collection<FGVertex> vertices = functionGraph.getVertices();
BlockModelService blockService = tool.getService(BlockModelService.class);
CodeBlockModel blockModel = blockService.getActiveBlockModel();
CodeBlockModel blockModel = blockService.getActiveBlockModel(program);
FunctionManager functionManager = program.getFunctionManager();
Function function = functionManager.getFunctionContaining(getAddress(startAddressString));
CodeBlockIterator iterator =
@@ -733,8 +733,6 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
setNavigationHistoryOption(NavigationHistoryChoices.NAVIGATION_EVENTS);
FGVertex start = getFocusedVertex();
FGVertex v1 = vertex("01004178");
pickVertex(v1);
@@ -744,7 +742,6 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
FGVertex v3 = vertex("010041a4");
pickVertex(v3);
assertInHistory(start);
assertNotInHistory(v1, v2);
//
@@ -756,7 +753,7 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
Address foo = getAddress("0x01002339");
goTo(foo);
assertInHistory(start.getVertexAddress(), ghidra);
assertInHistory(v3.getVertexAddress(), ghidra);
}
//==================================================================================================
@@ -774,12 +771,7 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
private void assertNotInHistory(List<Address> addresses) {
GoToService goTo = tool.getService(GoToService.class);
Navigatable navigatable = goTo.getDefaultNavigatable();
NavigationHistoryService service = tool.getService(NavigationHistoryService.class);
List<LocationMemento> locations = service.getPreviousLocations(navigatable);
List<LocationMemento> locations = getNavigationHistory();
List<Address> actualAddresses =
locations.stream()
.map(memento -> memento.getProgramLocation().getAddress())
@@ -792,6 +784,16 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
}
}
private List<LocationMemento> getNavigationHistory() {
GoToService goTo = tool.getService(GoToService.class);
Navigatable navigatable = goTo.getDefaultNavigatable();
NavigationHistoryService service = tool.getService(NavigationHistoryService.class);
List<LocationMemento> locations = service.getPreviousLocations(navigatable);
return locations;
}
private void assertInHistory(FGVertex... vertices) {
List<Address> vertexAddresses =
@@ -807,11 +809,7 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
private void assertInHistory(List<Address> addresses) {
GoToService goTo = tool.getService(GoToService.class);
Navigatable navigatable = goTo.getDefaultNavigatable();
NavigationHistoryService service = tool.getService(NavigationHistoryService.class);
List<LocationMemento> locations = service.getPreviousLocations(navigatable);
List<LocationMemento> locations = getNavigationHistory();
assertTrue("Vertex locations not added to history", addresses.size() <= locations.size());
List<Address> actualAddresses =
@@ -831,6 +829,7 @@ public class FunctionGraphPlugin1Test extends AbstractFunctionGraphTest {
FGController controller = getFunctionGraphController();
FunctionGraphOptions options = controller.getFunctionGraphOptions();
setInstanceField("navigationHistoryChoice", options, choice);
waitForSwing();
}
private void doTestLabelChangeAtVertexEntryUpdatesTitle() {