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

GP-0: Test fixes

Browse Source
This commit is contained in:
Dan
2021-11-26 10:25:30 -05:00
parent 060f14673c
commit ef71c697a2
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/ProposedUtils/src/main/java/ghidra/generic/util/datastruct/SemisparseByteArray.java
+1 -1
View File
@@ -215,7 +215,7 @@ public class SemisparseByteArray {
if (length < 0) { if (length < 0) {
throw new IllegalArgumentException("length: " + length); throw new IllegalArgumentException("length: " + length);
} }
if (loc + length < loc) { if (Long.compareUnsigned(loc + length, loc) < 0) {
throw new IndexOutOfBoundsException("given offset and length would exceed ULONG_MAX"); throw new IndexOutOfBoundsException("given offset and length would exceed ULONG_MAX");
} }
UnsignedLong uLoc = UnsignedLong.fromLongBits(loc); UnsignedLong uLoc = UnsignedLong.fromLongBits(loc);
Ghidra/Debug/ProposedUtils/src/test/java/ghidra/generic/util/datastruct/SemisparseByteArrayTest.java
+9 -5
View File
@@ -32,10 +32,14 @@ public class SemisparseByteArrayTest {
private static final String HELLO_WORLD = "Hello, World!"; private static final String HELLO_WORLD = "Hello, World!";
protected static final byte[] HW = HELLO_WORLD.getBytes(); protected static final byte[] HW = HELLO_WORLD.getBytes();
protected static Range<UnsignedLong> makeRange(long lower, long upper) { protected static Range<UnsignedLong> rngClosedOpen(long lower, long upper) {
return Range.closedOpen(UnsignedLong.fromLongBits(lower), UnsignedLong.fromLongBits(upper)); return Range.closedOpen(UnsignedLong.fromLongBits(lower), UnsignedLong.fromLongBits(upper));
} }
protected static Range<UnsignedLong> rngClosed(long lower, long upper) {
return Range.closed(UnsignedLong.fromLongBits(lower), UnsignedLong.fromLongBits(upper));
}
@Test @Test
public void testSingles() { public void testSingles() {
SemisparseByteArray cache = new SemisparseByteArray(); SemisparseByteArray cache = new SemisparseByteArray();
@@ -43,16 +47,16 @@ public class SemisparseByteArrayTest {
cache.putData(0, HW, 0, 1); cache.putData(0, HW, 0, 1);
exp.clear(); exp.clear();
exp.add(makeRange(0, 1)); exp.add(rngClosedOpen(0, 1));
assertEquals(exp, cache.getInitialized(0, HW.length + 7)); assertEquals(exp, cache.getInitialized(0, HW.length + 7));
exp.clear(); exp.clear();
exp.add(makeRange(1, HW.length)); exp.add(rngClosed(1, HW.length - 1));
assertEquals(exp, cache.getUninitialized(0, HW.length - 1)); assertEquals(exp, cache.getUninitialized(0, HW.length - 1));
cache.putData(2, HW, 2, 1); cache.putData(2, HW, 2, 1);
exp.clear(); exp.clear();
exp.add(makeRange(1, 2)); exp.add(rngClosedOpen(1, 2));
exp.add(makeRange(3, HW.length)); exp.add(rngClosed(3, HW.length - 1));
assertEquals(exp, cache.getUninitialized(0, HW.length - 1)); assertEquals(exp, cache.getUninitialized(0, HW.length - 1));
cache.putData(11, HW, 11, 2); cache.putData(11, HW, 11, 2);