mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-06 03:50:02 +02:00
GP-2308/1633 corrected ParseDialogParsingAndPromptsTest timing issues
This commit is contained in:
parent
08b20d5d21
commit
c67266a3f7
1 changed files with 30 additions and 13 deletions
|
@ -179,6 +179,8 @@ public class ParseDialogParsingAndPromptsTest extends AbstractGhidraHeadedIntegr
|
||||||
|
|
||||||
pressButtonByText(waitForDialogComponent("Confirm"), "Continue", false);
|
pressButtonByText(waitForDialogComponent("Confirm"), "Continue", false);
|
||||||
|
|
||||||
|
waitForBusyTool(tool);
|
||||||
|
|
||||||
pressButtonByText(waitForDialogComponent("C-Parse of Header Files Complete"), "OK", false);
|
pressButtonByText(waitForDialogComponent("C-Parse of Header Files Complete"), "OK", false);
|
||||||
|
|
||||||
DataType dataType = program.getDataTypeManager().getDataType("/"+dummyHeader.getName()+ "/" + "mystruct");
|
DataType dataType = program.getDataTypeManager().getDataType("/"+dummyHeader.getName()+ "/" + "mystruct");
|
||||||
|
@ -228,6 +230,8 @@ public class ParseDialogParsingAndPromptsTest extends AbstractGhidraHeadedIntegr
|
||||||
|
|
||||||
pressButtonByText(waitForDialogComponent("Confirm"), "Continue", false);
|
pressButtonByText(waitForDialogComponent("Confirm"), "Continue", false);
|
||||||
|
|
||||||
|
waitForBusyTool(tool);
|
||||||
|
|
||||||
pressButtonByText(waitForDialogComponent("C-Parse of Header Files Complete"), "OK", false);
|
pressButtonByText(waitForDialogComponent("C-Parse of Header Files Complete"), "OK", false);
|
||||||
|
|
||||||
DataType dataType = program.getDataTypeManager().getDataType("/"+dummyHeader.getName()+ "/" + "mystruct");
|
DataType dataType = program.getDataTypeManager().getDataType("/"+dummyHeader.getName()+ "/" + "mystruct");
|
||||||
|
@ -436,12 +440,18 @@ public class ParseDialogParsingAndPromptsTest extends AbstractGhidraHeadedIntegr
|
||||||
|
|
||||||
pressButtonByText(waitForDialogComponent("C-Parse of Header Files Complete"), "OK", false);
|
pressButtonByText(waitForDialogComponent("C-Parse of Header Files Complete"), "OK", false);
|
||||||
|
|
||||||
|
waitForBusyTool(tool);
|
||||||
|
|
||||||
// open the file archive
|
// open the file archive
|
||||||
FileDataTypeManager fileArchive = FileDataTypeManager.openFileArchive(GDTarchiveFile, false);
|
FileDataTypeManager fileArchive = FileDataTypeManager.openFileArchive(GDTarchiveFile, false);
|
||||||
|
try {
|
||||||
DataType dataType = fileArchive.getDataType("/"+dummyHeader.getName()+ "/" + "mystruct");
|
DataType dataType =
|
||||||
|
fileArchive.getDataType("/" + dummyHeader.getName() + "/" + "mystruct");
|
||||||
assertNotNull("mystruct parsed into program", dataType);
|
assertNotNull("mystruct parsed into program", dataType);
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
fileArchive.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// test parse to file, choose file
|
// test parse to file, choose file
|
||||||
|
@ -498,19 +508,26 @@ public class ParseDialogParsingAndPromptsTest extends AbstractGhidraHeadedIntegr
|
||||||
|
|
||||||
pressButtonByText(waitForDialogComponent("Use Open Archives?"), "Use Open Archives", false);
|
pressButtonByText(waitForDialogComponent("Use Open Archives?"), "Use Open Archives", false);
|
||||||
|
|
||||||
|
waitForBusyTool(tool);
|
||||||
|
|
||||||
pressButtonByText(waitForDialogComponent("C-Parse of Header Files Complete"), "OK", false);
|
pressButtonByText(waitForDialogComponent("C-Parse of Header Files Complete"), "OK", false);
|
||||||
|
|
||||||
// open the file archive
|
// open the file archive
|
||||||
FileDataTypeManager fileArchive = FileDataTypeManager.openFileArchive(GDTarchiveFile, false);
|
FileDataTypeManager fileArchive = FileDataTypeManager.openFileArchive(GDTarchiveFile, false);
|
||||||
|
try {
|
||||||
DataType dataType = fileArchive.getDataType("/"+dummyHeader.getName()+ "/" + "mystruct");
|
DataType dataType =
|
||||||
|
fileArchive.getDataType("/" + dummyHeader.getName() + "/" + "mystruct");
|
||||||
assertNotNull("mystruct parsed into program", dataType);
|
|
||||||
|
assertNotNull("mystruct parsed into program", dataType);
|
||||||
Structure struct = (Structure) dataType;
|
|
||||||
|
Structure struct = (Structure) dataType;
|
||||||
DataTypeComponent component = struct.getComponent(1);
|
|
||||||
assertEquals (component.getDataType().getName(), "wint_t");
|
DataTypeComponent component = struct.getComponent(1);
|
||||||
|
assertEquals(component.getDataType().getName(), "wint_t");
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
fileArchive.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue