GP-1543: Replace Range<Long> with Lifespan, ULongSpan, KeySpan,

FieldSpan
This commit is contained in:
Dan 2022-10-20 09:38:55 -04:00
parent d0b55e1d33
commit 776413921f
349 changed files with 6102 additions and 4225 deletions

View file

@ -15,7 +15,7 @@
*/
package agent.dbgeng.manager.impl;
import static ghidra.async.AsyncUtils.*;
import static ghidra.async.AsyncUtils.sequence;
import static org.junit.Assert.*;
import java.io.IOException;
@ -30,13 +30,13 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.*;
import com.google.common.collect.*;
import agent.dbgeng.dbgeng.DbgEngTest;
import agent.dbgeng.dbgeng.DebugProcessId;
import agent.dbgeng.manager.*;
import agent.dbgeng.manager.DbgManager.ExecSuffix;
import agent.dbgeng.manager.breakpoint.DbgBreakpointInfo;
import generic.ULongSpan;
import generic.ULongSpan.ULongSpanSet;
import ghidra.async.AsyncFence;
import ghidra.async.TypeSpec;
import ghidra.dbg.testutil.DummyProc;
@ -320,11 +320,10 @@ public abstract class AbstractDbgManagerTest extends AbstractGhidraHeadlessInteg
thread.get().writeMemory(addr.get(), buf).handle(seq::next);
}).then(seq -> {
thread.get().readMemory(addr.get(), rBuf).handle(seq::next);
}, TypeSpec.obj((RangeSet<Long>) null)).then((rng, seq) -> {
}, TypeSpec.obj((ULongSpanSet) null)).then((rng, seq) -> {
rBuf.flip();
rBuf.order(ByteOrder.LITTLE_ENDIAN);
RangeSet<Long> exp = TreeRangeSet.create();
exp.add(Range.closedOpen(addr.get(), addr.get() + 1024));
ULongSpanSet exp = ULongSpanSet.of(ULongSpan.extent(addr.get(), 1024));
assertEquals(exp, rng);
for (int i = 0; i < 10; i++) {
assertEquals(i, rBuf.getInt());