yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2025-03-25-2'

Browse source
This commit is contained in:
Ryan Kurtz 2025-03-25 12:13:29 -04:00
commit 587571ea4f
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Debug/Debugger-rmi-trace/src/test/java/ghidra/app/plugin/core/debug/service/tracermi/TestTraceRmiClient.java
View file

@ -22,9 +22,9 @@ import java.nio.channels.SocketChannel;
import ghidra.framework.Application; import ghidra.framework.Application;
import ghidra.rmi.trace.TraceRmi.*; import ghidra.rmi.trace.TraceRmi.*;
import ghidra.rmi.trace.TraceRmi.Compiler;
import ghidra.trace.model.target.schema.TraceObjectSchema; import ghidra.trace.model.target.schema.TraceObjectSchema;
import ghidra.trace.model.target.schema.XmlSchemaContext; import ghidra.trace.model.target.schema.XmlSchemaContext;
import ghidra.trace.model.time.schedule.TraceSchedule;
public class TestTraceRmiClient { public class TestTraceRmiClient {
final ProtobufSocket<RootMessage> socket; final ProtobufSocket<RootMessage> socket;
@ -118,12 +118,14 @@ public class TestTraceRmiClient {
.setRequestSnapshot(RequestSnapshot.newBuilder() .setRequestSnapshot(RequestSnapshot.newBuilder()
.setOid(DomObjId.newBuilder() .setOid(DomObjId.newBuilder()
.setId(traceId)) .setId(traceId))
.setSnap(Snap.newBuilder() .setSchedule(Schedule.newBuilder()
.setSnap(snap)) .setSchedule(TraceSchedule.snap(snap).toString()))
.setDescription(description)) .setDescription(description))
.build()); .build());
assertEquals(RootMessage.newBuilder() assertEquals(RootMessage.newBuilder()
.setReplySnapshot(ReplySnapshot.newBuilder()) .setReplySnapshot(ReplySnapshot.newBuilder()
.setSnap(Snap.newBuilder()
.setSnap(snap)))
.build(), .build(),
socket.recv()); socket.recv());
} }

17
Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/DBTraceTimeViewportTest.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -37,10 +37,13 @@ public class DBTraceTimeViewportTest extends AbstractGhidraHeadlessIntegrationTe
@Test @Test
public void testEmptyTime() throws Exception { public void testEmptyTime() throws Exception {
/**
* Even if the initial snapshot 0 does not exist, we now always truncate at 0 as if it did.
*/
try (ToyDBTraceBuilder tb = new ToyDBTraceBuilder("test", "Toy:BE:64:default")) { try (ToyDBTraceBuilder tb = new ToyDBTraceBuilder("test", "Toy:BE:64:default")) {
DBTraceTimeViewport viewport = tb.trace.createTimeViewport(); DBTraceTimeViewport viewport = tb.trace.createTimeViewport();
viewport.setSnap(10); viewport.setSnap(10);
assertEquals(lifeSetOf(Lifespan.span(Long.MIN_VALUE, 10)), viewport.spanSet); assertEquals(lifeSetOf(Lifespan.span(0, 10)), viewport.spanSet);
} }
} }
@ -93,12 +96,14 @@ public class DBTraceTimeViewportTest extends AbstractGhidraHeadlessIntegrationTe
try (ToyDBTraceBuilder tb = new ToyDBTraceBuilder("test", "Toy:BE:64:default")) { try (ToyDBTraceBuilder tb = new ToyDBTraceBuilder("test", "Toy:BE:64:default")) {
try (Transaction tx = tb.startTransaction()) { try (Transaction tx = tb.startTransaction()) {
DBTraceTimeManager tm = tb.trace.getTimeManager(); DBTraceTimeManager tm = tb.trace.getTimeManager();
tm.getSnapshot(Long.MIN_VALUE, true).setSchedule(TraceSchedule.parse("10:4")); tm.getSnapshot(2, true).setSchedule(TraceSchedule.parse("10:4"));
} }
DBTraceTimeViewport viewport = tb.trace.createTimeViewport(); DBTraceTimeViewport viewport = tb.trace.createTimeViewport();
viewport.setSnap(Long.MIN_VALUE); viewport.setSnap(2);
assertEquals(lifeSetOf(Lifespan.at(Long.MIN_VALUE)), viewport.spanSet); assertEquals(lifeSetOf(Lifespan.at(2)), viewport.spanSet);
viewport.setSnap(3);
assertEquals(lifeSetOf(Lifespan.span(2, 3)), viewport.spanSet);
} }
} }
} }