Magic-Mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-30 08:00:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test fixes

Browse Source
This commit is contained in:
dragonmacher 2022-06-02 12:16:15 -04:00
parent 28e3c2b8db
commit f1326af7f3
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,8 @@ public class UnionEditorActions1Test extends AbstractUnionEditorTest {
for (CompositeEditorTableAction action : actions) {
if ((action instanceof FavoritesAction) || (action instanceof CycleGroupAction) ||
(action instanceof EditFieldAction) || (action instanceof PointerAction) ||
(action instanceof HexNumbersAction)) {
(action instanceof HexNumbersAction) ||
(action instanceof ShowDataTypeInTreeAction)) {
checkEnablement(action, true);
}
else {
@ -113,7 +114,8 @@ public class UnionEditorActions1Test extends AbstractUnionEditorTest {
(action instanceof DuplicateAction) ||
(action instanceof DuplicateMultipleAction) || (action instanceof DeleteAction) ||
(action instanceof ArrayAction) || (action instanceof PointerAction) ||
(action instanceof HexNumbersAction)) {
(action instanceof HexNumbersAction) ||
(action instanceof ShowDataTypeInTreeAction)) {
checkEnablement(action, true);
}
else {
@ -136,7 +138,8 @@ public class UnionEditorActions1Test extends AbstractUnionEditorTest {
(action instanceof MoveDownAction) || (action instanceof DuplicateAction) ||
(action instanceof DuplicateMultipleAction) || (action instanceof DeleteAction) ||
(action instanceof ArrayAction) || (action instanceof PointerAction) ||
(action instanceof HexNumbersAction)) {
(action instanceof HexNumbersAction) ||
(action instanceof ShowDataTypeInTreeAction)) {
checkEnablement(action, true);
}
else {
@ -159,7 +162,8 @@ public class UnionEditorActions1Test extends AbstractUnionEditorTest {
(action instanceof DuplicateAction) ||
(action instanceof DuplicateMultipleAction) || (action instanceof DeleteAction) ||
(action instanceof ArrayAction) || (action instanceof PointerAction) ||
(action instanceof HexNumbersAction)) {
(action instanceof HexNumbersAction) ||
(action instanceof ShowDataTypeInTreeAction)) {
checkEnablement(action, true);
}
else {
@ -179,7 +183,8 @@ public class UnionEditorActions1Test extends AbstractUnionEditorTest {
if ((action instanceof FavoritesAction) || (action instanceof CycleGroupAction)// enabled to show message
|| (action instanceof MoveDownAction) || (action instanceof MoveUpAction) ||
(action instanceof DeleteAction) || (action instanceof PointerAction) ||
(action instanceof HexNumbersAction)) {
(action instanceof HexNumbersAction) ||
(action instanceof ShowDataTypeInTreeAction)) {
checkEnablement(action, true);
}
else {
@ -198,7 +203,8 @@ public class UnionEditorActions1Test extends AbstractUnionEditorTest {
setSelection(new int[] { 2, 3, 6, 7 });
for (CompositeEditorTableAction action : actions) {
if ((action instanceof FavoritesAction) || (action instanceof CycleGroupAction) ||
(action instanceof DeleteAction) || (action instanceof HexNumbersAction)) {
(action instanceof DeleteAction) || (action instanceof HexNumbersAction) ||
(action instanceof ShowDataTypeInTreeAction)) {
checkEnablement(action, true);
}
else {

6
Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGTest.java
View File

@ -298,11 +298,13 @@ public abstract class AbstractGTest {
}
public static <T> void assertContainsString(String expected, String actual) {
assertTrue(actual.contains(expected));
assertTrue("String not contained. Found: '" + actual + "'\n\tExpected to contain: '" +
expected + "'", actual.contains(expected));
}
public static <T> void assertContainsStringIgnoringCase(String expected, String actual) {
assertTrue(expected.toLowerCase().contains(actual.toLowerCase()));
assertTrue("String not contained. Found: '" + actual + "'\n\tExpected to contain: '" +
expected + "'", actual.toLowerCase().contains(expected.toLowerCase()));
}
private static String printListFailureMessage(String message, List<?> expected,