diff options
author | 2022-11-26 01:12:33 +0100 | |
---|---|---|
committer | 2022-12-09 00:07:38 +0100 | |
commit | 5f8a34454a289ba4408d19bef5d5387c78ac36c2 (patch) | |
tree | 41dc5a121c822589cfba0db3caad99a53f006c2d /subprojects/language-web/src/test/java | |
parent | refactor(frontend): simplify diagnostic tracking (diff) | |
download | refinery-5f8a34454a289ba4408d19bef5d5387c78ac36c2.tar.gz refinery-5f8a34454a289ba4408d19bef5d5387c78ac36c2.tar.zst refinery-5f8a34454a289ba4408d19bef5d5387c78ac36c2.zip |
refactor: be more conservative w/preview features
Also test with virtual threads in we are using them in production.
Diffstat (limited to 'subprojects/language-web/src/test/java')
2 files changed, 3 insertions, 2 deletions
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java index 6dfce780..24fab4e3 100644 --- a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java +++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java | |||
@@ -177,6 +177,7 @@ class ProblemWebSocketServletIntegrationTest { | |||
177 | 177 | ||
178 | private void startServer(String allowedOrigins) { | 178 | private void startServer(String allowedOrigins) { |
179 | server = new Server(new InetSocketAddress(SERVER_PORT)); | 179 | server = new Server(new InetSocketAddress(SERVER_PORT)); |
180 | ServerLauncher.enableVirtualThreads(server); | ||
180 | var handler = new ServletContextHandler(); | 181 | var handler = new ServletContextHandler(); |
181 | var holder = new ServletHolder(ProblemWebSocketServlet.class); | 182 | var holder = new ServletHolder(ProblemWebSocketServlet.class); |
182 | if (allowedOrigins != null) { | 183 | if (allowedOrigins != null) { |
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java index ebf36f13..25343109 100644 --- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java +++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java | |||
@@ -1,14 +1,14 @@ | |||
1 | package tools.refinery.language.web.tests; | 1 | package tools.refinery.language.web.tests; |
2 | 2 | ||
3 | import com.google.inject.Singleton; | 3 | import com.google.inject.Singleton; |
4 | import org.eclipse.xtext.ide.ExecutorServiceProvider; | 4 | import tools.refinery.language.web.xtext.VirtualThreadExecutorServiceProvider; |
5 | 5 | ||
6 | import java.util.ArrayList; | 6 | import java.util.ArrayList; |
7 | import java.util.List; | 7 | import java.util.List; |
8 | import java.util.concurrent.ExecutorService; | 8 | import java.util.concurrent.ExecutorService; |
9 | 9 | ||
10 | @Singleton | 10 | @Singleton |
11 | public class AwaitTerminationExecutorServiceProvider extends ExecutorServiceProvider { | 11 | public class AwaitTerminationExecutorServiceProvider extends VirtualThreadExecutorServiceProvider { |
12 | private final List<RestartableCachedThreadPool> servicesToShutDown = new ArrayList<>(); | 12 | private final List<RestartableCachedThreadPool> servicesToShutDown = new ArrayList<>(); |
13 | 13 | ||
14 | @Override | 14 | @Override |