Skip to content

Commit 6d604af

Browse files
committed
Tests - fixed tests related to rename of the next/previous actions
1 parent 3b3b725 commit 6d604af

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserNavigationSegmentedAddressTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void setUp() throws Exception {
6565
tool.addPlugin(LocationReferencesPlugin.class.getName());
6666
tool.addPlugin(MarkerManagerPlugin.class.getName());
6767
NextPrevAddressPlugin np = env.getPlugin(NextPrevAddressPlugin.class);
68-
prev = getAction(np, "Previous in History Buffer");
68+
prev = getAction(np, "Previous Location in History");
6969
clearHistory = getAction(np, "Clear History Buffer");
7070
cb = env.getPlugin(CodeBrowserPlugin.class);
7171
nextFunction = getAction(cb, "Go to next function");

Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void setUp() throws Exception {
7676
pm.openProgram(program.getDomainFile());
7777

7878
NextPrevAddressPlugin np = env.getPlugin(NextPrevAddressPlugin.class);
79-
getAction(np, "Previous in History Buffer");
79+
getAction(np, "Previous Location in History");
8080
getAction(np, "Clear History Buffer");
8181
cb = env.getPlugin(CodeBrowserPlugin.class);
8282
fp = cb.getFieldPanel();

Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/GoToPluginTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -603,8 +603,8 @@ public void testQueryResultsDialogNavigation() throws Exception {
603603
public void testNextPrevious() throws Exception {
604604
tool.addPlugin(NextPrevAddressPlugin.class.getName());
605605
NextPrevAddressPlugin np = env.getPlugin(NextPrevAddressPlugin.class);
606-
DockingActionIf next = getAction(np, "Next in History Buffer");
607-
DockingActionIf prev = getAction(np, "Previous in History Buffer");
606+
DockingActionIf next = getAction(np, "Next Location in History");
607+
DockingActionIf prev = getAction(np, "Previous Location in History");
608608
DockingActionIf clear = getAction(np, "Clear History Buffer");
609609
assertTrue(!clear.isEnabledForContext(provider.getActionContext(null)));
610610
assertTrue(!next.isEnabledForContext(provider.getActionContext(null)));
@@ -765,7 +765,7 @@ public void testNavigateToOtherProgramOption() throws Exception {
765765
setOptionToAllowNavigationToOtherOpenPrograms();
766766
performOkCallback();
767767

768-
assertTrue("Expected goto to succeed and dialog to be gone", !dialog.isShowing());
768+
assertFalse("Expected goto to succeed and dialog to be gone", dialog.isShowing());
769769

770770
}
771771

Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/NavigationHistoryPluginTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public void setUp() throws Exception {
7575
cb = env.getPlugin(CodeBrowserPlugin.class);
7676
goToService = tool.getService(GoToService.class);
7777
navigatable = goToService.getDefaultNavigatable();
78-
prevAction = getAction(nextPrevPlugin, "Previous in History Buffer");
79-
nextAction = getAction(nextPrevPlugin, "Next in History Buffer");
78+
prevAction = getAction(nextPrevPlugin, "Previous Location in History");
79+
nextAction = getAction(nextPrevPlugin, "Next Location in History");
8080
ProgramManagerPlugin pmp = env.getPlugin(ProgramManagerPlugin.class);
8181
undoAction = getAction(pmp, "Undo");
8282
redoAction = getAction(pmp, "Redo");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2291,7 +2291,7 @@ protected void moveView(int amount) {
22912291
}
22922292

22932293
protected void navigateBack() {
2294-
String name = "Previous in History Buffer";
2294+
String name = "Previous Location in History";
22952295

22962296
DockingActionIf action = getAction(tool, "NextPrevAddressPlugin", name);
22972297
performAction(action, true);

0 commit comments

Comments
 (0)