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

GP-2496 edit shared project info improvements

Browse source
This commit is contained in:
ghidra1 2022-09-08 17:57:09 -04:00
parent 09d326ddbb
commit 52d1097c5b
17 changed files with 416 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/FrontEndPluginScreenShots.java
View file

@ -329,7 +329,7 @@ public class FrontEndPluginScreenShots extends GhidraScreenShotGenerator {
FrontEndPlugin plugin = getPlugin(tool, FrontEndPlugin.class);
JComponent projectDataPanel = (JComponent) getInstanceField("projectDataPanel", plugin);
JTabbedPane tabbedPane =
(JTabbedPane) getInstanceField("projectTabPanel", projectDataPanel);
(JTabbedPane) getInstanceField("projectTab", projectDataPanel);
tabbedPane.setSelectedIndex(1);
setToolSize(800, 600);
captureComponent(projectDataPanel);

33
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/ProjectInfoDialogTest.java
View file

@ -25,7 +25,6 @@ import javax.swing.*;
import org.junit.*;
import org.junit.experimental.categories.Category;
import docking.AbstractErrDialog;
import docking.action.DockingActionIf;
import docking.widgets.OptionDialog;
import docking.wizard.WizardManager;
@ -278,7 +277,8 @@ public class ProjectInfoDialogTest extends AbstractGhidraHeadedIntegrationTest {
waitForTasks();
// check out file from shared project
rootFolder = getProject().getProjectData().getRootFolder();
Project oldProject = getProject();
rootFolder = oldProject.getProjectData().getRootFolder();
DomainFile df = rootFolder.getFile("testA");
df.addToVersionControl("test", true, TaskMonitor.DUMMY);
assertTrue(df.isCheckedOut());
@ -299,11 +299,34 @@ public class ProjectInfoDialogTest extends AbstractGhidraHeadedIntegrationTest {
assertNotNull(opt);
assertEquals("Update Shared Project Info", opt.getTitle());
pressButtonByText(opt, "Update");
opt = waitForDialogComponent(OptionDialog.class);
assertNotNull(opt);
assertEquals("Terminate Unrecognized Checkouts", opt.getTitle());
pressButtonByText(opt, "Terminate Checkouts and Continue");
waitForTasks();
AbstractErrDialog errorDialog = waitForErrorDialog();
assertEquals("Failed to Update Shared Project Info", errorDialog.getTitle());
close(errorDialog);
dialog = waitForDialogComponent(ProjectInfoDialog.class);
assertNotNull(dialog);
pressButtonByText(dialog, "Dismiss");
Project updatedProject = getProject();
assertNotNull(updatedProject);
assertTrue(updatedProject != oldProject);
RepositoryAdapter rep = updatedProject.getRepository();
assertNotNull(rep);
assertEquals("AnotherRepository", rep.getName());
ProjectData updatedProjectData = updatedProject.getProjectData();
rootFolder = updatedProjectData.getRootFolder();
assertNull(rootFolder.getFile("testA"));
df = rootFolder.getFile("testA.keep");
assertNotNull(df);
assertFalse(df.isVersioned());
assertFalse(df.isCheckedOut());
}
private void checkProjectInfo(String expectedRepName) {