yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

GP-2974: Fixing warnings

Browse source
This commit is contained in:
Ryan Kurtz 2023-04-26 08:03:57 -04:00
parent 113156a19f
commit 7fa3389119
662 changed files with 2198 additions and 2216 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffApply2Test.java
View file

@ -34,7 +34,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
showApplySettings();
byte[] bytes = diffTestP1.getListing().getCodeUnitAt(addr("100")).getBytes();
@ -57,7 +57,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
showApplySettings();
List<Equate> eqs = diffTestP1.getEquateTable().getEquates(addr("1002261"), 0);
@ -81,7 +81,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
showApplySettings();
AddressSet addrSet = new AddressSet(addr("1005e4f"), addr("1005e53"));
@ -95,7 +95,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
showApplySettings();
// Cursor in selection
@ -106,7 +106,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
assertNotNull(ignoreDiffs);
assertTrue(ignoreDiffs.isEnabled());
invokeLater(ignoreDiffs);
waitForPostedSwingRunnables();
waitForSwing();
AddressSet expectedDiffs = origDiffs.subtract(addrSet);
ProgramSelection newSet = diffPlugin.getDiffHighlightSelection();
assertTrue(newSet.intersect(addrSet).isEmpty());
@ -123,7 +123,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
assertNotNull(ignoreDiffs);
assertTrue(ignoreDiffs.isEnabled());
invokeLater(ignoreDiffs);
waitForPostedSwingRunnables();
waitForSwing();
expectedDiffs = origDiffs.subtract(addrSet);
newSet = diffPlugin.getDiffHighlightSelection();
assertTrue(newSet.intersect(addrSet).isEmpty());
@ -138,7 +138,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
showApplySettings();
// Cursor in selection
@ -150,7 +150,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
assertNotNull(ignoreDiffs);
assertTrue(ignoreDiffs.isEnabled());
invokeLater(ignoreDiffs);
waitForPostedSwingRunnables();
waitForSwing();
AddressSet expectedDiffs = origDiffs.subtract(addrSet);
ProgramSelection newSet = diffPlugin.getDiffHighlightSelection();
assertTrue(newSet.intersect(addrSet).isEmpty());
@ -165,7 +165,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
showApplySettings();
List<Equate> eqs = program.getEquateTable().getEquates(addr("1002261"), 0);

6
Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffApplyTest.java
View file

@ -32,14 +32,14 @@ public class DiffApplyTest extends DiffApplyTestAdapter {
assertTrue(isProviderShown(tool.getToolFrame(), "Diff Apply Settings"));
diffPlugin.getDiffApplySettingsProvider().closeComponent();
waitForPostedSwingRunnables();
waitForSwing();
assertTrue(!isProviderShown(tool.getToolFrame(), "Diff Apply Settings"));
invokeLater(diffApplySettings);
assertTrue(isProviderShown(tool.getToolFrame(), "Diff Apply Settings"));
diffPlugin.getDiffApplySettingsProvider().closeComponent();
waitForPostedSwingRunnables();
waitForSwing();
assertTrue(!isProviderShown(tool.getToolFrame(), "Diff Apply Settings"));
invokeLater(diffApplySettings);
@ -229,7 +229,7 @@ public class DiffApplyTest extends DiffApplyTestAdapter {
programBuilderDiffTest2.createMemory("d2", "0x200", 0x100);
openDiff(diffTestP1, diffTestP2);
waitForPostedSwingRunnables();
waitForSwing();
showApplySettings();
invokeLater(replaceAll);

20
Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffGet2Test.java
View file

@ -28,11 +28,11 @@ public class DiffGet2Test extends DiffTestAdapter {
getDiffDialog(diffTestP1, diffTestP2);
setAllTypes(false);
byteCB.setSelected(true);
waitForPostedSwingRunnables();
waitForSwing();
pressButtonByText(getDiffsDialog, "OK");
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
waitForDiff();
assertEquals(getPgmByteDiffs(), diffPlugin.getDiffHighlightSelection());
@ -43,11 +43,11 @@ public class DiffGet2Test extends DiffTestAdapter {
getDiffDialog(diffTestP1, diffTestP2);
setAllTypes(false);
codeUnitCB.setSelected(true);
waitForPostedSwingRunnables();
waitForSwing();
pressButtonByText(getDiffsDialog, "OK");
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
waitForDiff();
assertEquals(getPgmCodeUnitDiffs(), diffPlugin.getDiffHighlightSelection());
@ -58,11 +58,11 @@ public class DiffGet2Test extends DiffTestAdapter {
getDiffDialog(diffTestP1, diffTestP2);
setAllTypes(false);
programContextCB.setSelected(true);
waitForPostedSwingRunnables();
waitForSwing();
pressButtonByText(getDiffsDialog, "OK");
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
waitForDiff();
assertEquals(getPgmProgramContextDiffs(), diffPlugin.getDiffHighlightSelection());
}
@ -72,11 +72,11 @@ public class DiffGet2Test extends DiffTestAdapter {
getDiffDialog(diffTestP1, diffTestP2);
setAllTypes(false);
bookmarkCB.setSelected(true);
waitForPostedSwingRunnables();
waitForSwing();
pressButtonByText(getDiffsDialog, "OK");
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
waitForDiff();
assertEquals(getPgmBookmarkDiffs(), diffPlugin.getDiffHighlightSelection());
}
@ -86,11 +86,11 @@ public class DiffGet2Test extends DiffTestAdapter {
getDiffDialog(diffTestP1, diffTestP2);
setAllTypes(false);
commentCB.setSelected(true);
waitForPostedSwingRunnables();
waitForSwing();
pressButtonByText(getDiffsDialog, "OK");
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
waitForDiff();
assertEquals(getPgmCommentDiffs(), diffPlugin.getDiffHighlightSelection());
}

6
Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffIgnoreTest.java
View file

@ -40,7 +40,7 @@ public class DiffIgnoreTest extends DiffApplyTestAdapter {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
byte[] bytes = diffTestP1.getListing().getCodeUnitAt(addr("100")).getBytes();
assertEquals((byte) 0xac, bytes[0]);
@ -65,7 +65,7 @@ public class DiffIgnoreTest extends DiffApplyTestAdapter {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
List<Equate> eqs = diffTestP1.getEquateTable().getEquates(addr("1002261"), 0);
assertEquals(0, eqs.size());
@ -89,7 +89,7 @@ public class DiffIgnoreTest extends DiffApplyTestAdapter {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
waitForSwing();
AddressSet addrSet = new AddressSet(addr("1005e4f"), addr("1005e53"));
setDiffSelection(addrSet);