From 4bd811ca746c550d6bf8ae6114299f88fb6ac58b Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Wed, 22 Jul 2026 13:45:03 -0400
Subject: [PATCH] Test fixes

---
 .../StructureEditorLockedEnablementTest.java  | 21 ++++++++++++-------
 ...StructureEditorUnlockedEnablementTest.java | 18 ++++++++++------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorLockedEnablementTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorLockedEnablementTest.java
index 9f2c26c9e7..5ed39a25d7 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorLockedEnablementTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorLockedEnablementTest.java
@@ -67,7 +67,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
 		for (CompositeEditorTableAction action : actions) {
 			if ((action instanceof EditFieldAction) || (action instanceof AddBitFieldAction) ||
 				(action instanceof InsertUndefinedAction) || (action instanceof PointerAction) ||
-				(action instanceof HexNumbersAction) || (action instanceof ApplyAction)) {
+				(action instanceof HexNumbersAction) || (action instanceof ApplyAction) ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else if (action instanceof FavoritesAction) {
@@ -118,7 +119,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
 			if ((action instanceof EditFieldAction) || (action instanceof AddBitFieldAction) ||
 				(action instanceof InsertUndefinedAction) || (action instanceof PointerAction) ||
 				(action instanceof HexNumbersAction) ||
-				(action instanceof ShowDataTypeInTreeAction)) {
+				(action instanceof ShowDataTypeInTreeAction) ||
+				(action instanceof NextPrevDefinedComponentAction)) {
 				checkEnablement(action, true);
 			}
 			else if (action instanceof FavoritesAction) {
@@ -169,7 +171,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
 				(action instanceof PointerAction) || (action instanceof HexNumbersAction) ||
 				(action instanceof CreateInternalStructureAction) ||
 				(action instanceof ShowDataTypeInTreeAction) ||
-				action instanceof FindReferencesToStructureFieldAction) {
+				action instanceof FindReferencesToStructureFieldAction ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else {
@@ -200,7 +203,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
 				(action instanceof PointerAction) || (action instanceof HexNumbersAction) ||
 				(action instanceof CreateInternalStructureAction) ||
 				(action instanceof ShowDataTypeInTreeAction) ||
-				action instanceof FindReferencesToStructureFieldAction) {
+				action instanceof FindReferencesToStructureFieldAction ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else {
@@ -231,7 +235,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
 				(action instanceof PointerAction) || (action instanceof HexNumbersAction) ||
 				(action instanceof CreateInternalStructureAction) ||
 				(action instanceof ShowDataTypeInTreeAction) ||
-				action instanceof FindReferencesToStructureFieldAction) {
+				action instanceof FindReferencesToStructureFieldAction ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else {
@@ -260,7 +265,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
 				(action instanceof DeleteAction) || (action instanceof ArrayAction) ||
 				(action instanceof PointerAction) || (action instanceof HexNumbersAction) ||
 				(action instanceof CreateInternalStructureAction) ||
-				(action instanceof ShowDataTypeInTreeAction)) {
+				(action instanceof ShowDataTypeInTreeAction) ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else {
@@ -285,7 +291,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
 			}
 			else if ((action instanceof CycleGroupAction) || (action instanceof ClearAction) ||
 				(action instanceof DeleteAction) || (action instanceof HexNumbersAction) ||
-				(action instanceof ShowDataTypeInTreeAction)) {
+				(action instanceof ShowDataTypeInTreeAction) ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else {
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorUnlockedEnablementTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorUnlockedEnablementTest.java
index 5d818449f6..9d94316e80 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorUnlockedEnablementTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorUnlockedEnablementTest.java
@@ -49,7 +49,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
 			if ((action instanceof FavoritesAction) || (action instanceof CycleGroupAction) ||
 				(action instanceof EditFieldAction) || (action instanceof InsertUndefinedAction) ||
 				(action instanceof AddBitFieldAction) || (action instanceof PointerAction) ||
-				(action instanceof HexNumbersAction) || (action instanceof ApplyAction)) {
+				(action instanceof HexNumbersAction) || (action instanceof ApplyAction) ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else {
@@ -84,7 +85,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
 				(action instanceof EditFieldAction) || (action instanceof InsertUndefinedAction) ||
 				(action instanceof AddBitFieldAction) || (action instanceof PointerAction) ||
 				(action instanceof HexNumbersAction) ||
-				(action instanceof ShowDataTypeInTreeAction)) {
+				(action instanceof ShowDataTypeInTreeAction) ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else {
@@ -119,7 +121,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
 				(action instanceof HexNumbersAction) ||
 				(action instanceof CreateInternalStructureAction) ||
 				(action instanceof ShowDataTypeInTreeAction ||
-					action instanceof FindReferencesToStructureFieldAction)) {
+					action instanceof FindReferencesToStructureFieldAction) ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else if (action instanceof FavoritesAction) {
@@ -160,7 +163,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
 				(action instanceof PointerAction) || (action instanceof HexNumbersAction) ||
 				(action instanceof CreateInternalStructureAction) ||
 				(action instanceof ShowDataTypeInTreeAction ||
-					action instanceof FindReferencesToStructureFieldAction)) {
+					action instanceof FindReferencesToStructureFieldAction) ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else if (action instanceof FavoritesAction) {
@@ -202,7 +206,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
 				(action instanceof HexNumbersAction) ||
 				(action instanceof CreateInternalStructureAction) ||
 				(action instanceof ShowDataTypeInTreeAction ||
-					action instanceof FindReferencesToStructureFieldAction)) {
+					action instanceof FindReferencesToStructureFieldAction) ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else if (action instanceof FavoritesAction) {
@@ -242,7 +247,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
 				(action instanceof EditFieldAction) || (action instanceof InsertUndefinedAction) ||
 				(action instanceof AddBitFieldAction) || (action instanceof PointerAction) ||
 				(action instanceof HexNumbersAction) ||
-				(action instanceof ShowDataTypeInTreeAction)) {
+				(action instanceof ShowDataTypeInTreeAction) ||
+				action instanceof NextPrevDefinedComponentAction) {
 				checkEnablement(action, true);
 			}
 			else {