Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-24 13:21:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-02-23-21'

Browse Source
This commit is contained in:
ghidra1
2021-02-23 16:53:17 -05:00
parent 9e8297da3a 446ade9e02
commit c446d32102
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/data/ApplyDataTypeToBrowserTest.java
+2 -5
View File
@@ -167,7 +167,7 @@ public class ApplyDataTypeToBrowserTest extends AbstractGhidraHeadedIntegrationT
@Test
public void testChooseDataTypeOnDefinedDts() throws Exception {
//
//
// Test that apply data on an existing type will offer to clear that type
//
@@ -206,8 +206,6 @@ public class ApplyDataTypeToBrowserTest extends AbstractGhidraHeadedIntegrationT
public void testChooseDataTypeWhereDoesNotFit() throws Exception {
goTo("004027e0");
showDataTypeChooser();
showDataTypeChooser();
chooseInDialog("_person");
@@ -790,8 +788,7 @@ public class ApplyDataTypeToBrowserTest extends AbstractGhidraHeadedIntegrationT
assertEquals(expectedText, statusText);
}
private void dragNDropDataTypeToCurrentBrowserLocation(
final DataType dataType) {
private void dragNDropDataTypeToCurrentBrowserLocation(final DataType dataType) {
executeOnSwingWithoutBlocking(() -> {
// Simulate the drag-n-drop of the data type onto the location.
ProgramLocation programLocation = codeViewerProvider.getLocation();