yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-2986-dragonmacher-component-provider-methods--SQUASHED'
This commit is contained in:
ghidra1 2023-02-03 17:55:23 -05:00
commit 7143f64c51
174 changed files with 1393 additions and 1455 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/DataTypeManagerPluginScreenShots.java
View file

@ -34,7 +34,6 @@ import ghidra.app.plugin.core.datamgr.*;
import ghidra.app.plugin.core.datamgr.actions.FindStructuresBySizeAction;
import ghidra.app.plugin.core.datamgr.archive.DataTypeManagerHandler;
import ghidra.app.plugin.core.datamgr.archive.InvalidFileArchive;
import ghidra.app.plugin.core.datamgr.util.ConflictDialog;
import ghidra.framework.preferences.Preferences;
import ghidra.program.model.data.*;
import ghidra.util.UniversalID;
@ -74,13 +73,6 @@ public class DataTypeManagerPluginScreenShots extends GhidraScreenShotGenerator
captureDialog(900, 500);
}
@Test
public void testDataTypeConflict() {
ConflictDialog dialog = new ConflictDialog("SIZE_T", "/baseDTs", "SIZE_T.conflict");
showModalDialogInTool(dialog);
captureDialog();
}
@Test
public void testDataTypeManager() {
captureIsolatedProvider(DataTypesProvider.class, 500, 400);

8
Ghidra/Test/IntegrationTest/src/test/java/ghidra/util/bean/PathManagerTest.java
View file

@ -187,9 +187,9 @@ public class PathManagerTest extends AbstractDockingTest {
File temp = createTempFileForTest();
Preferences.setProperty(Preferences.LAST_IMPORT_DIRECTORY, temp.getParent());
Preferences.setProperty(Preferences.LAST_PATH_DIRECTORY, temp.getParent());
pathManager.setFileChooserProperties("Select Source Files",
Preferences.LAST_IMPORT_DIRECTORY, GhidraFileChooserMode.FILES_AND_DIRECTORIES, true,
Preferences.LAST_PATH_DIRECTORY, GhidraFileChooserMode.FILES_AND_DIRECTORIES, true,
new ExtensionFileFilter(new String[] { "h" }, "C Header Files"));
assertNotNull(addButton);
@ -223,9 +223,9 @@ public class PathManagerTest extends AbstractDockingTest {
File temp = createTempFileForTest();
Preferences.setProperty(Preferences.LAST_IMPORT_DIRECTORY, temp.getParent());
Preferences.setProperty(Preferences.LAST_PATH_DIRECTORY, temp.getParent());
pathManager.setFileChooserProperties("Select Source Files",
Preferences.LAST_IMPORT_DIRECTORY, GhidraFileChooserMode.FILES_AND_DIRECTORIES, true,
Preferences.LAST_PATH_DIRECTORY, GhidraFileChooserMode.FILES_AND_DIRECTORIES, true,
new ExtensionFileFilter(new String[] { "h" }, "C Header Files"));
assertNotNull(addButton);

12
Ghidra/Test/IntegrationTest/src/test/java/ghidra/util/bean/PathnameTablePanelTest.java
View file

@ -171,8 +171,8 @@ public class PathnameTablePanelTest extends AbstractDockingTest {
public void testAddButton() throws Exception {
File temp = createTempFileForTest();
Preferences.setProperty(Preferences.LAST_IMPORT_DIRECTORY, temp.getParent());
panel.setFileChooserProperties("Select Source Files", Preferences.LAST_IMPORT_DIRECTORY,
Preferences.setProperty(Preferences.LAST_PATH_DIRECTORY, temp.getParent());
panel.setFileChooserProperties("Select Source Files", Preferences.LAST_PATH_DIRECTORY,
GhidraFileChooserMode.FILES_AND_DIRECTORIES, true,
new ExtensionFileFilter(new String[] { "h" }, "C Header Files"));
@ -193,8 +193,8 @@ public class PathnameTablePanelTest extends AbstractDockingTest {
File temp = createTempFileForTest();
Preferences.setProperty(Preferences.LAST_IMPORT_DIRECTORY, temp.getParent());
panel.setFileChooserProperties("Select Source Files", Preferences.LAST_IMPORT_DIRECTORY,
Preferences.setProperty(Preferences.LAST_PATH_DIRECTORY, temp.getParent());
panel.setFileChooserProperties("Select Source Files", Preferences.LAST_PATH_DIRECTORY,
GhidraFileChooserMode.FILES_AND_DIRECTORIES, true,
new ExtensionFileFilter(new String[] { "h" }, "C Header Files"));
@ -227,8 +227,8 @@ public class PathnameTablePanelTest extends AbstractDockingTest {
panel.setAddToTop(true);
File temp = createTempFileForTest();
Preferences.setProperty(Preferences.LAST_IMPORT_DIRECTORY, temp.getParent());
panel.setFileChooserProperties("Select Source Files", Preferences.LAST_IMPORT_DIRECTORY,
Preferences.setProperty(Preferences.LAST_PATH_DIRECTORY, temp.getParent());
panel.setFileChooserProperties("Select Source Files", Preferences.LAST_PATH_DIRECTORY,
GhidraFileChooserMode.FILES_AND_DIRECTORIES, true,
new ExtensionFileFilter(new String[] { "h" }, "C Header Files"));