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

GP-0: Test fixes

Browse Source
This commit is contained in:
Ryan Kurtz
2024-05-21 10:22:25 -04:00
parent 87131b4762
commit 587307eefe
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/test/AbstractGhidraHeadlessIntegrationTest.java
+2 -3
View File
@@ -21,7 +21,6 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import org.apache.commons.collections4.BidiMap;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import docking.test.AbstractDockingTest; import docking.test.AbstractDockingTest;
@@ -613,8 +612,8 @@ public abstract class AbstractGhidraHeadlessIntegrationTest extends AbstractDock
Map<String, Set<ClassFileInfo>> extensionPointSuffixToInfoMap = Map<String, Set<ClassFileInfo>> extensionPointSuffixToInfoMap =
(Map<String, Set<ClassFileInfo>>) getInstanceField("extensionPointSuffixToInfoMap", (Map<String, Set<ClassFileInfo>>) getInstanceField("extensionPointSuffixToInfoMap",
ClassSearcher.class); ClassSearcher.class);
BidiMap<ClassFileInfo, Class<?>> loadedCache = HashMap<ClassFileInfo, Class<?>> loadedCache =
(BidiMap<ClassFileInfo, Class<?>>) getInstanceField("loadedCache", ClassSearcher.class); (HashMap<ClassFileInfo, Class<?>>) getInstanceField("loadedCache", ClassSearcher.class);
String suffix = ClassSearcher.getExtensionPointSuffix(service.getSimpleName()); String suffix = ClassSearcher.getExtensionPointSuffix(service.getSimpleName());
if (suffix != null) { if (suffix != null) {
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/analysis/AnalysisOptions2Test.java
+2 -3
View File
@@ -24,7 +24,6 @@ import java.util.*;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.table.TableModel; import javax.swing.table.TableModel;
import org.apache.commons.collections4.BidiMap;
import org.junit.*; import org.junit.*;
import docking.ActionContext; import docking.ActionContext;
@@ -256,8 +255,8 @@ public class AnalysisOptions2Test extends AbstractGhidraHeadedIntegrationTest {
Map<String, Set<ClassFileInfo>> extensionPointSuffixToInfoMap = Map<String, Set<ClassFileInfo>> extensionPointSuffixToInfoMap =
(Map<String, Set<ClassFileInfo>>) getInstanceField("extensionPointSuffixToInfoMap", (Map<String, Set<ClassFileInfo>>) getInstanceField("extensionPointSuffixToInfoMap",
ClassSearcher.class); ClassSearcher.class);
BidiMap<ClassFileInfo, Class<?>> loadedCache = HashMap<ClassFileInfo, Class<?>> loadedCache =
(BidiMap<ClassFileInfo, Class<?>>) getInstanceField("loadedCache", ClassSearcher.class); (HashMap<ClassFileInfo, Class<?>>) getInstanceField("loadedCache", ClassSearcher.class);
// remove any traces of previous test runs // remove any traces of previous test runs
Set<ClassFileInfo> analyzerSet = extensionPointSuffixToInfoMap.get("Analyzer"); Set<ClassFileInfo> analyzerSet = extensionPointSuffixToInfoMap.get("Analyzer");