From 6e066d43c2201a782cacdd2c8368149d4fecbfa2 Mon Sep 17 00:00:00 2001 From: Vaci Koblizek Date: Sat, 14 Nov 2020 10:31:59 +0000 Subject: [PATCH] send abort to close test connection --- runtime-rpc/src/main/java/org/capnproto/VatNetwork.java | 1 - runtime-rpc/src/test/java/org/capnproto/RpcTest.java | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/runtime-rpc/src/main/java/org/capnproto/VatNetwork.java b/runtime-rpc/src/main/java/org/capnproto/VatNetwork.java index 4204b78..3ee8726 100644 --- a/runtime-rpc/src/main/java/org/capnproto/VatNetwork.java +++ b/runtime-rpc/src/main/java/org/capnproto/VatNetwork.java @@ -1,6 +1,5 @@ package org.capnproto; -import java.io.IOException; import java.util.concurrent.CompletableFuture; public interface VatNetwork diff --git a/runtime-rpc/src/test/java/org/capnproto/RpcTest.java b/runtime-rpc/src/test/java/org/capnproto/RpcTest.java index af0cdfa..26f96a0 100644 --- a/runtime-rpc/src/test/java/org/capnproto/RpcTest.java +++ b/runtime-rpc/src/test/java/org/capnproto/RpcTest.java @@ -33,10 +33,11 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; +import static org.capnproto.RpcState.FromException; public class RpcTest { - final class TestNetwork { + static final class TestNetwork { final Map map = new HashMap<>(); int received = 0; @@ -51,7 +52,7 @@ public class RpcTest { } } - final class TestNetworkAdapter + static final class TestNetworkAdapter implements VatNetwork { @Override @@ -169,6 +170,10 @@ 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(); } }