mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-07-30 07:18:37 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-7-22-26'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-07-22 14:27:23 -04:00
parent ad8f879a86 4bd811ca74
commit 6ad14f7278
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorLockedEnablementTest.java
View File

@@ -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 {

18
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorUnlockedEnablementTest.java
View File

@@ -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 {