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

Merge remote-tracking branch 'origin/GP-1196_ghizard_AbstractGTest_Rule_fix'

Browse Source
This commit is contained in:
Ryan Kurtz
2021-08-11 15:17:44 -04:00
parent 1ebf208b94 5fb65d845f
commit ac82dcdf81
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGTest.java
+4 -2
View File
@@ -15,7 +15,8 @@
*/ */
package generic.test; package generic.test;
import static org.junit.Assert.*; import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import java.io.File; import java.io.File;
import java.util.*; import java.util.*;
@@ -26,6 +27,7 @@ import java.util.function.BooleanSupplier;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Rule;
import org.junit.rules.TestName; import org.junit.rules.TestName;
import ghidra.framework.Application; import ghidra.framework.Application;
@@ -68,6 +70,7 @@ public abstract class AbstractGTest {
private static String testDirectoryPath = createTestDirectoryPath(); private static String testDirectoryPath = createTestDirectoryPath();
@Rule
public TestName testName = new TestName(); public TestName testName = new TestName();
/** /**
@@ -339,7 +342,6 @@ public abstract class AbstractGTest {
return result; return result;
} }
//================================================================================================== //==================================================================================================
// Wait Methods // Wait Methods
//================================================================================================== //==================================================================================================