Skip to content

Properly cancel the rpc futures as to stop the client&server in the json-rpc tests #2768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavyLandman merged 2 commits into from
Apr 23, 2026
+49 −19
Merged

Properly cancel the rpc futures as to stop the client&server in the json-rpc tests #2768

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e3f387
Properly cancel the rpc futures as to stop the client&server in the t…
DavyLandman Apr 22, 2026
a7bad44
Fixed spacing & comment
DavyLandman Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 49 additions & 19 deletions test/org/rascalmpl/test/rpc/IValueOverJsonTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;

import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Expand All @@ -15,12 +16,14 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;

import org.checkerframework.checker.nullness.qual.Nullable;
import org.eclipse.lsp4j.jsonrpc.Launcher;
import org.eclipse.lsp4j.jsonrpc.messages.ResponseError;
import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
Expand Down Expand Up @@ -74,6 +77,8 @@ public class IValueOverJsonTests {
private final PipedInputStream is0, is1;
private final PipedOutputStream os0, os1;
private final ExecutorService exec = Executors.newCachedThreadPool();
private final TestThread server;
private final TestClient client;

@Parameters(name="{0}")
public static Iterable<Object[]> modesAndConfig() {
Expand All @@ -94,31 +99,42 @@ public IValueOverJsonTests(ComplexTypeMode complexTypeMode, Consumer<GsonBuilder
os0 = new PipedOutputStream();
is1 = new PipedInputStream(os0);
os1 = new PipedOutputStream(is0);
new TestThread(is0, os0, gsonConfig, exec).start();
new TestClient(is1, os1, gsonConfig);
server = new TestThread(is0, os0, gsonConfig, exec);
server.start();
client = new TestClient(is1, os1, gsonConfig);
} catch (IOException e) {
throw new RuntimeException(e);
}
}

static void close(@Nullable Closeable cl) throws IOException {
Comment thread
rodinaarssen marked this conversation as resolved.
if (cl != null) {
cl.close();
}
}

@After
public void teardown() throws IOException {
exec.shutdown();
if (is0 != null) {
is0.close();
}
if (is1 != null) {
is1.close();
}
if (os0 != null) {
os0.close();
}
if (os1 != null) {
os1.close();
}
close(client);
close(server);
// give the JSON-RPC server a bit of time to actually close everything before we jank away the streams
CompletableFuture.delayedExecutor(100, TimeUnit.MILLISECONDS).execute(() -> {
try {
close(is0);
close(is1);
close(os0);
close(os1);
exec.shutdown();
}
catch (IOException ignored) {
System.err.println("Closing the streams failed with: " + ignored.getMessage());
ignored.printStackTrace();
}
});
}

class TestClient {
class TestClient implements Closeable {
private final Future<Void> connection;
public TestClient(InputStream is, OutputStream os, Consumer<GsonBuilder> gsonConfig) {
Launcher<JsonRpcTestInterface> clientLauncher = new Launcher.Builder<JsonRpcTestInterface>()
.setLocalService(this)
Expand All @@ -133,16 +149,23 @@ public TestClient(InputStream is, OutputStream os, Consumer<GsonBuilder> gsonCon
.setExecutorService(exec)
.create();

clientLauncher.startListening();
connection = clientLauncher.startListening();
testServer = clientLauncher.getRemoteProxy();
}
@Override
public void close() throws IOException {
if (connection != null) {
connection.cancel(true);
}
}
}

static class TestThread extends Thread {
static class TestThread extends Thread implements Closeable {
private final InputStream is;
private final OutputStream os;
private final Consumer<GsonBuilder> gsonConfig;
private final ExecutorService exec;
private volatile Future<Void> socket;

public TestThread(InputStream is, OutputStream os, Consumer<GsonBuilder> gsonConfig, ExecutorService exec) {
this.is = is;
Expand All @@ -167,7 +190,14 @@ public void run() {
.setExecutorService(exec)
.create();

serverLauncher.startListening();
socket = serverLauncher.startListening();
}

@Override
public void close() throws IOException {
if (socket != null) {
socket.cancel(true);
}
}
}

Expand Down
Loading