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/GP-3402-dragonmacher-graph-threading'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-05-11 06:51:08 -04:00
parent 78d9a6c6e3 bde74ad4d3
commit e2188d4cfb
12 changed files with 422 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/graph/GraphActionsTest.java
View File

@@ -72,9 +72,8 @@ public class GraphActionsTest extends AbstractGhidraHeadedIntegrationTest {
assertTrue(display.getSelectedVertices().isEmpty());
DockingActionIf action = getAction(tool, "Select Vertex");
VertexGraphActionContext context =
new VertexGraphActionContext(graphComponentProvider, graph, null, null,
graph.getVertex("B"));
VertexGraphActionContext context = new VertexGraphActionContext(graphComponentProvider,
graph, null, null, graph.getVertex("B"));
performAction(action, context, true);
Set<AttributedVertex> selectedVertices = display.getSelectedVertices();
@@ -102,9 +101,8 @@ public class GraphActionsTest extends AbstractGhidraHeadedIntegrationTest {
assertEquals(4, display.getSelectedVertices().size());
DockingActionIf action = getAction(tool, "Deselect Vertex");
VertexGraphActionContext context =
new VertexGraphActionContext(graphComponentProvider, graph, null, null,
graph.getVertex("B"));
VertexGraphActionContext context = new VertexGraphActionContext(graphComponentProvider,
graph, null, null, graph.getVertex("B"));
performAction(action, context, true);
Set<AttributedVertex> selected = display.getSelectedVertices();
@@ -121,9 +119,8 @@ public class GraphActionsTest extends AbstractGhidraHeadedIntegrationTest {
assertTrue(display.getSelectedVertices().isEmpty());
DockingActionIf action = getAction(tool, "Select Edge");
EdgeGraphActionContext context =
new EdgeGraphActionContext(graphComponentProvider, graph, null, null,
graph.getEdge(graph.getVertex("A"), graph.getVertex("B")));
EdgeGraphActionContext context = new EdgeGraphActionContext(graphComponentProvider, graph,
null, null, graph.getEdge(graph.getVertex("A"), graph.getVertex("B")));
performAction(action, context, true);
Set<AttributedVertex> selectedVerticeIds = display.getSelectedVertices();
@@ -135,9 +132,8 @@ public class GraphActionsTest extends AbstractGhidraHeadedIntegrationTest {
@Test
public void testDeSelectEdgeAction() {
DockingActionIf action = getAction(tool, "Select Edge");
EdgeGraphActionContext context =
new EdgeGraphActionContext(graphComponentProvider, graph, null, null,
graph.getEdge(graph.getVertex("A"), graph.getVertex("B")));
EdgeGraphActionContext context = new EdgeGraphActionContext(graphComponentProvider, graph,
null, null, graph.getEdge(graph.getVertex("A"), graph.getVertex("B")));
performAction(action, context, true);
Set<AttributedVertex> selectedVertices = display.getSelectedVertices();
@@ -155,9 +151,8 @@ public class GraphActionsTest extends AbstractGhidraHeadedIntegrationTest {
public void testSelectEdgeSource() {
setFocusedVertex(d);
DockingActionIf action = getAction(tool, "Edge Source");
EdgeGraphActionContext context =
new EdgeGraphActionContext(graphComponentProvider, graph, null, null,
graph.getEdge(graph.getVertex("A"), graph.getVertex("B")));
EdgeGraphActionContext context = new EdgeGraphActionContext(graphComponentProvider, graph,
null, null, graph.getEdge(graph.getVertex("A"), graph.getVertex("B")));
performAction(action, context, true);
assertEquals(a, display.getFocusedVertex());
@@ -167,9 +162,8 @@ public class GraphActionsTest extends AbstractGhidraHeadedIntegrationTest {
public void testSelectEdgeTarget() {
setFocusedVertex(d);
DockingActionIf action = getAction(tool, "Edge Target");
EdgeGraphActionContext context =
new EdgeGraphActionContext(graphComponentProvider, graph, null, null,
graph.getEdge(a, b));
EdgeGraphActionContext context = new EdgeGraphActionContext(graphComponentProvider, graph,
null, null, graph.getEdge(a, b));
performAction(action, context, true);
assertEquals(b, display.getFocusedVertex());
@@ -523,11 +517,6 @@ public class GraphActionsTest extends AbstractGhidraHeadedIntegrationTest {
private class TestGraphDisplayListener implements GraphDisplayListener {
@Override
public void graphClosed() {
// do nothing
}
@Override
public void selectionChanged(Set<AttributedVertex> vertices) {
graphSpy.setSelection(vertices);
@@ -545,7 +534,7 @@ public class GraphActionsTest extends AbstractGhidraHeadedIntegrationTest {
@Override
public void dispose() {
// do nothing
// stub
}
}