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-28-26'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-07-29 05:18:10 -04:00
parent a839514e8a 6a78dc7b00
commit a14dad67f3
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,8 @@ public class StructureEditorAlignmentTest extends AbstractStructureEditorTest {
(pAction instanceof HexNumbersAction) || (pAction instanceof HexNumbersAction) ||
(pAction instanceof InsertUndefinedAction) || (pAction instanceof InsertUndefinedAction) ||
(pAction instanceof AddBitFieldAction) || (pAction instanceof ApplyAction) || (pAction instanceof AddBitFieldAction) || (pAction instanceof ApplyAction) ||
pAction instanceof NextPrevDefinedComponentAction) { pAction instanceof NextPrevDefinedComponentAction ||
pAction instanceof JumpToOffsetAction) {
checkEnablement(pAction, true); checkEnablement(pAction, true);
} }
else { else {
@@ -148,7 +149,8 @@ public class StructureEditorAlignmentTest extends AbstractStructureEditorTest {
(pAction instanceof CreateInternalStructureAction) || (pAction instanceof CreateInternalStructureAction) ||
(pAction instanceof ShowComponentPathAction) || (pAction instanceof ApplyAction) || (pAction instanceof ShowComponentPathAction) || (pAction instanceof ApplyAction) ||
(pAction instanceof FindReferencesToStructureFieldAction) || (pAction instanceof FindReferencesToStructureFieldAction) ||
pAction instanceof NextPrevDefinedComponentAction) { pAction instanceof NextPrevDefinedComponentAction ||
pAction instanceof JumpToOffsetAction) {
checkEnablement(pAction, true); checkEnablement(pAction, true);
} }
else { else {

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

@@ -68,7 +68,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
if ((action instanceof EditFieldAction) || (action instanceof AddBitFieldAction) || if ((action instanceof EditFieldAction) || (action instanceof AddBitFieldAction) ||
(action instanceof InsertUndefinedAction) || (action instanceof PointerAction) || (action instanceof InsertUndefinedAction) || (action instanceof PointerAction) ||
(action instanceof HexNumbersAction) || (action instanceof ApplyAction) || (action instanceof HexNumbersAction) || (action instanceof ApplyAction) ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else if (action instanceof FavoritesAction) { else if (action instanceof FavoritesAction) {
@@ -120,7 +121,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
(action instanceof InsertUndefinedAction) || (action instanceof PointerAction) || (action instanceof InsertUndefinedAction) || (action instanceof PointerAction) ||
(action instanceof HexNumbersAction) || (action instanceof HexNumbersAction) ||
(action instanceof ShowDataTypeInTreeAction) || (action instanceof ShowDataTypeInTreeAction) ||
(action instanceof NextPrevDefinedComponentAction)) { (action instanceof NextPrevDefinedComponentAction) ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else if (action instanceof FavoritesAction) { else if (action instanceof FavoritesAction) {
@@ -172,7 +174,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
(action instanceof CreateInternalStructureAction) || (action instanceof CreateInternalStructureAction) ||
(action instanceof ShowDataTypeInTreeAction) || (action instanceof ShowDataTypeInTreeAction) ||
action instanceof FindReferencesToStructureFieldAction || action instanceof FindReferencesToStructureFieldAction ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else { else {
@@ -204,7 +207,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
(action instanceof CreateInternalStructureAction) || (action instanceof CreateInternalStructureAction) ||
(action instanceof ShowDataTypeInTreeAction) || (action instanceof ShowDataTypeInTreeAction) ||
action instanceof FindReferencesToStructureFieldAction || action instanceof FindReferencesToStructureFieldAction ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else { else {
@@ -236,7 +240,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
(action instanceof CreateInternalStructureAction) || (action instanceof CreateInternalStructureAction) ||
(action instanceof ShowDataTypeInTreeAction) || (action instanceof ShowDataTypeInTreeAction) ||
action instanceof FindReferencesToStructureFieldAction || action instanceof FindReferencesToStructureFieldAction ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else { else {
@@ -266,7 +271,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
(action instanceof PointerAction) || (action instanceof HexNumbersAction) || (action instanceof PointerAction) || (action instanceof HexNumbersAction) ||
(action instanceof CreateInternalStructureAction) || (action instanceof CreateInternalStructureAction) ||
(action instanceof ShowDataTypeInTreeAction) || (action instanceof ShowDataTypeInTreeAction) ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else { else {
@@ -292,7 +298,8 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
else if ((action instanceof CycleGroupAction) || (action instanceof ClearAction) || else if ((action instanceof CycleGroupAction) || (action instanceof ClearAction) ||
(action instanceof DeleteAction) || (action instanceof HexNumbersAction) || (action instanceof DeleteAction) || (action instanceof HexNumbersAction) ||
(action instanceof ShowDataTypeInTreeAction) || (action instanceof ShowDataTypeInTreeAction) ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else { else {

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

@@ -50,7 +50,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
(action instanceof EditFieldAction) || (action instanceof InsertUndefinedAction) || (action instanceof EditFieldAction) || (action instanceof InsertUndefinedAction) ||
(action instanceof AddBitFieldAction) || (action instanceof PointerAction) || (action instanceof AddBitFieldAction) || (action instanceof PointerAction) ||
(action instanceof HexNumbersAction) || (action instanceof ApplyAction) || (action instanceof HexNumbersAction) || (action instanceof ApplyAction) ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else { else {
@@ -86,7 +87,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
(action instanceof AddBitFieldAction) || (action instanceof PointerAction) || (action instanceof AddBitFieldAction) || (action instanceof PointerAction) ||
(action instanceof HexNumbersAction) || (action instanceof HexNumbersAction) ||
(action instanceof ShowDataTypeInTreeAction) || (action instanceof ShowDataTypeInTreeAction) ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else { else {
@@ -122,7 +124,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
(action instanceof CreateInternalStructureAction) || (action instanceof CreateInternalStructureAction) ||
(action instanceof ShowDataTypeInTreeAction || (action instanceof ShowDataTypeInTreeAction ||
action instanceof FindReferencesToStructureFieldAction) || action instanceof FindReferencesToStructureFieldAction) ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else if (action instanceof FavoritesAction) { else if (action instanceof FavoritesAction) {
@@ -164,7 +167,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
(action instanceof CreateInternalStructureAction) || (action instanceof CreateInternalStructureAction) ||
(action instanceof ShowDataTypeInTreeAction || (action instanceof ShowDataTypeInTreeAction ||
action instanceof FindReferencesToStructureFieldAction) || action instanceof FindReferencesToStructureFieldAction) ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else if (action instanceof FavoritesAction) { else if (action instanceof FavoritesAction) {
@@ -207,7 +211,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
(action instanceof CreateInternalStructureAction) || (action instanceof CreateInternalStructureAction) ||
(action instanceof ShowDataTypeInTreeAction || (action instanceof ShowDataTypeInTreeAction ||
action instanceof FindReferencesToStructureFieldAction) || action instanceof FindReferencesToStructureFieldAction) ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else if (action instanceof FavoritesAction) { else if (action instanceof FavoritesAction) {
@@ -248,7 +253,8 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
(action instanceof AddBitFieldAction) || (action instanceof PointerAction) || (action instanceof AddBitFieldAction) || (action instanceof PointerAction) ||
(action instanceof HexNumbersAction) || (action instanceof HexNumbersAction) ||
(action instanceof ShowDataTypeInTreeAction) || (action instanceof ShowDataTypeInTreeAction) ||
action instanceof NextPrevDefinedComponentAction) { action instanceof NextPrevDefinedComponentAction ||
action instanceof JumpToOffsetAction) {
checkEnablement(action, true); checkEnablement(action, true);
} }
else { else {