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

Merge remote-tracking branch 'origin/GP-0-dragonamacher-test-fixes-01-05-22'

Browse Source
This commit is contained in:
ghidra1
2022-01-05 22:39:06 -05:00
parent 2d2de2d830 5f3b91a90a
commit 64685e13a8
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPluginTest.java
+17 -15
View File
@@ -349,10 +349,12 @@ public class DataTypeManagerPluginTest extends AbstractGhidraHeadedIntegrationTe
waitForTree();
// make sure the new node is selected
TreePath[] selectionPaths = tree.getSelectionPaths();
assertNotNull(selectionPaths);
assertEquals(1, selectionPaths.length);
waitFor(() -> {
TreePath[] selectionPaths = tree.getSelectionPaths();
return selectionPaths != null && selectionPaths.length == 1;
});
TreePath[] selectionPaths = tree.getSelectionPaths();
CategoryNode newMiscNode = (CategoryNode) programNode.getChild(newCategoryName);
GTreeNode selectedNode = (GTreeNode) selectionPaths[0].getLastPathComponent();
assertEquals(newMiscNode, selectedNode);
@@ -797,8 +799,8 @@ public class DataTypeManagerPluginTest extends AbstractGhidraHeadedIntegrationTe
pressButtonByText(dialog, "OK");
DataTypesProvider resultsProvider = waitForComponentProvider(DataTypesProvider.class,
FindStructuresByOffsetAction.NAME);
DataTypesProvider resultsProvider =
waitForComponentProvider(DataTypesProvider.class, FindStructuresByOffsetAction.NAME);
assertMatchingStructures(resultsProvider, "ArrayStruct");
}
@@ -813,8 +815,8 @@ public class DataTypeManagerPluginTest extends AbstractGhidraHeadedIntegrationTe
pressButtonByText(dialog, "OK");
DataTypesProvider resultsProvider = waitForComponentProvider(DataTypesProvider.class,
FindStructuresByOffsetAction.NAME);
DataTypesProvider resultsProvider =
waitForComponentProvider(DataTypesProvider.class, FindStructuresByOffsetAction.NAME);
assertMatchingStructures(resultsProvider);
}
@@ -829,8 +831,8 @@ public class DataTypeManagerPluginTest extends AbstractGhidraHeadedIntegrationTe
pressButtonByText(dialog, "OK");
DataTypesProvider resultsProvider = waitForComponentProvider(DataTypesProvider.class,
FindStructuresByOffsetAction.NAME);
DataTypesProvider resultsProvider =
waitForComponentProvider(DataTypesProvider.class, FindStructuresByOffsetAction.NAME);
assertMatchingStructures(resultsProvider, "ArrayStruct");
}
@@ -850,8 +852,8 @@ public class DataTypeManagerPluginTest extends AbstractGhidraHeadedIntegrationTe
pressButtonByText(dialog, "OK");
DataTypesProvider resultsProvider = waitForComponentProvider(DataTypesProvider.class,
FindStructuresByOffsetAction.NAME);
DataTypesProvider resultsProvider =
waitForComponentProvider(DataTypesProvider.class, FindStructuresByOffsetAction.NAME);
assertMatchingStructures(resultsProvider, "Structure_0x8", "Structure_0x10",
"Structure_0x20");
}
@@ -872,8 +874,8 @@ public class DataTypeManagerPluginTest extends AbstractGhidraHeadedIntegrationTe
pressButtonByText(dialog, "OK");
DataTypesProvider resultsProvider = waitForComponentProvider(DataTypesProvider.class,
FindStructuresBySizeAction.NAME);
DataTypesProvider resultsProvider =
waitForComponentProvider(DataTypesProvider.class, FindStructuresBySizeAction.NAME);
assertMatchingStructures(resultsProvider, "Structure_0x8");
}
@@ -893,8 +895,8 @@ public class DataTypeManagerPluginTest extends AbstractGhidraHeadedIntegrationTe
pressButtonByText(dialog, "OK");
DataTypesProvider resultsProvider = waitForComponentProvider(DataTypesProvider.class,
FindStructuresBySizeAction.NAME);
DataTypesProvider resultsProvider =
waitForComponentProvider(DataTypesProvider.class, FindStructuresBySizeAction.NAME);
assertMatchingStructures(resultsProvider, "Structure_0x10", "Structure_0x20");
}