Skip to content

Ghidra is a software reverse engineering (SRE) framework

Test fixes

dragonmacher963bc62f026f
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPluginTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPluginTest.java
index e583d0d22c..7d24b431df 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPluginTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPluginTest.java
@@ -31,6 +31,7 @@ import ghidra.app.cmd.disassemble.DisassembleCommand;
import ghidra.app.plugin.core.bookmark.BookmarkEditCmd;
import ghidra.app.plugin.core.codebrowser.CodeBrowserPlugin;
import ghidra.app.services.GoToService;
+import ghidra.app.util.viewer.field.AddressFieldFactory;
import ghidra.app.util.viewer.field.FunctionSignatureFieldFactory;
import ghidra.framework.cmd.CompoundCmd;
import ghidra.framework.plugintool.PluginTool;
@@ -159,6 +160,9 @@ public class NextPrevCodeUnitPluginTest extends AbstractGhidraHeadedIntegrationT
@Test
public void testSearchInstruction() throws Exception {
+ // Note: if we don't start on the address field, then the first call to nextInstruction()
+ // will go to the address field.
+ cb.goToField(addr("0x1001000"), AddressFieldFactory.FIELD_NAME, 0, 0);
assertAddress("0x1001000");
nextInstruction();
assertAddress("0x1002239");
diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerPanel.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerPanel.java
index 039ad23c8e..faf4dc4663 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerPanel.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerPanel.java
@@ -102,7 +102,7 @@ public class DecompilerPanel extends JPanel implements FieldMouseListener, Field
private Color originalBackgroundColor;
private boolean useNonFunctionColor = false;
- private boolean navitationEnabled = true;
+ private boolean navigationEnabled = true;
private DecompilerHoverProvider decompilerHoverProvider;
@@ -760,7 +760,7 @@ public class DecompilerPanel extends JPanel implements FieldMouseListener, Field
* @param enabled false disabled mouse function navigation
*/
void setMouseNavigationEnabled(boolean enabled) {
- navitationEnabled = enabled;
+ navigationEnabled = enabled;
}
@Override
@@ -791,7 +791,7 @@ public class DecompilerPanel extends JPanel implements FieldMouseListener, Field
private void tryToGoto(FieldLocation location, Field field, MouseEvent event,
boolean newWindow) {
- if (!navitationEnabled) {
+ if (!navigationEnabled) {
return;
}