development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-02 16:33:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-dependency-fix'

Browse source
This commit is contained in:
Ryan Kurtz 2022-05-20 14:01:19 -04:00
parent d428ecd97a e4cf4feef7
commit 6e6087a5fd
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGTest.java
View file

@ -15,8 +15,6 @@
*/
package generic.test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.StringContains.*;
import static org.junit.Assert.*;
import java.io.File;
@ -300,12 +298,11 @@ public abstract class AbstractGTest {
}
public static <T> void assertContainsString(String expected, String actual) {
assertThat(actual, containsString(expected));
assertTrue(actual.contains(expected));
}
public static <T> void assertContainsStringIgnoringCase(String expected, String actual) {
// newer hamcrest versions have containsStringIgnoringCase()
assertThat(actual.toLowerCase(), containsString(expected.toLowerCase()));
assertTrue(expected.toLowerCase().contains(actual.toLowerCase()));
}
private static String printListFailureMessage(String message, List<?> expected,