development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-13 21:52:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test fixes

Browse source
This commit is contained in:
dragonmacher 2022-03-03 12:40:33 -05:00
parent bcfef70bfa
commit f0fde23192
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/table/TableComponentProvider.java
View file

@ -221,7 +221,7 @@ public class TableComponentProvider<T> extends ComponentProviderAdapter
} }
private String generateSubTitle() { private String generateSubTitle() {
StringBuffer buffer = new StringBuffer(); StringBuilder buffer = new StringBuilder();
buffer.append("("); buffer.append("(");
buffer.append(programName); buffer.append(programName);
buffer.append(") "); buffer.append(") ");
@ -264,16 +264,15 @@ public class TableComponentProvider<T> extends ComponentProviderAdapter
if (navigatable != null) { if (navigatable != null) {
navigatable.removeNavigatableListener(this); navigatable.removeNavigatableListener(this);
} }
tool.removeComponentProvider(this); tool.removeComponentProvider(this);
tableServicePlugin.remove(this); tableServicePlugin.remove(this);
model.dispose();
if (markerSet != null) { if (markerSet != null) {
markerSet.clearAll(); markerSet.clearAll();
markerService.removeMarker(markerSet, program); markerService.removeMarker(markerSet, program);
} }
tableServicePlugin = null;
threadedPanel.dispose();
tableFilterPanel.dispose(); tableFilterPanel.dispose();
} }

4
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserNavigationTest.java
View file

@ -134,7 +134,7 @@ public class CodeBrowserNavigationTest extends AbstractCodeBrowserNavigationTest
waitForTableModel(model); waitForTableModel(model);
assertEquals(3, model.getRowCount()); assertEquals(3, model.getRowCount());
runSwing(() -> providers[0].closeComponent()); runSwing(() -> getProviders()[0].closeComponent());
} }
@Test @Test
@ -161,7 +161,7 @@ public class CodeBrowserNavigationTest extends AbstractCodeBrowserNavigationTest
assertEquals("01008080", model.getValueAt(7, columnIndex).toString()); assertEquals("01008080", model.getValueAt(7, columnIndex).toString());
assertEquals("01008090", model.getValueAt(8, columnIndex).toString()); assertEquals("01008090", model.getValueAt(8, columnIndex).toString());
getProviders()[0].closeComponent(); runSwing(() -> getProviders()[0].closeComponent());
} }
@Test @Test