serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disconnect test networks on close

Browse source
This commit is contained in:
Vaci Koblizek 2020-11-14 12:50:33 +00:00
parent 6e066d43c2
commit 330eb50cf0
2 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
runtime-rpc/src/test/java/org/capnproto/RpcTest.java
View file

@ -53,12 +53,8 @@ public class RpcTest {
}
static final class TestNetworkAdapter
implements VatNetwork<Test.TestSturdyRef.Reader> {
@Override
public CompletableFuture<VatNetwork.Connection<Test.TestSturdyRef.Reader>> baseAccept() {
return this.accept().thenApply(conn -> conn);
}
implements VatNetwork<Test.TestSturdyRef.Reader>,
AutoCloseable {
class Connection implements VatNetwork.Connection<Test.TestSturdyRef.Reader> {
@ -82,6 +78,14 @@ public class RpcTest {
other.partner = this;
}
void disconnect(Exception exc) {
while (!fulfillers.isEmpty()) {
fulfillers.remove().completeExceptionally(exc);
}
this.networkException = exc;
}
TestNetwork getNetwork() {
return network;
}
@ -170,10 +174,6 @@ public class RpcTest {
@Override
public void close() {
var msg = newOutgoingMessage(0);
var abort = msg.getBody().initAs(RpcProtocol.Message.factory).initAbort();
FromException(RpcException.disconnected(""), abort);
msg.send();
}
}
@ -194,6 +194,18 @@ public class RpcTest {
return new Connection(isClient, peerId);
}
public CompletableFuture<VatNetwork.Connection<Test.TestSturdyRef.Reader>> baseAccept() {
return this.accept().thenApply(conn -> conn);
}
@Override
public void close() {
var exc = RpcException.failed("Network was destroyed");
for (var conn: this.connections.values()) {
conn.disconnect(exc);
}
}
@Override
public VatNetwork.Connection<Test.TestSturdyRef.Reader> connect(Test.TestSturdyRef.Reader refId) {
var hostId = refId.getHostId().getHost().toString();

5
runtime-rpc/src/test/java/org/capnproto/TwoPartyTest.java
View file

@ -12,6 +12,7 @@ import java.nio.channels.AsynchronousSocketChannel;
import java.util.concurrent.ExecutionException;
import java.util.function.Consumer;
@SuppressWarnings({"OverlyCoupledMethod", "OverlyLongMethod"})
public class TwoPartyTest {
static final class PipeThread {
@ -163,8 +164,8 @@ public class TwoPartyTest {
var pipelineRequest2 = new Test.TestExtends.Client(promise.getOutBox().getCap()).graultRequest();
var pipelinePromise2 = pipelineRequest2.send();
Assert.assertThrows(Exception.class, () -> pipelinePromise.join());
Assert.assertThrows(Exception.class, () -> pipelinePromise2.join());
Assert.assertThrows(Exception.class, pipelinePromise::join);
Assert.assertThrows(Exception.class, pipelinePromise2::join);
Assert.assertEquals(3, callCount.value());
Assert.assertEquals(1, chainedCallCount.value());