1 files changed, 46 insertions, 0 deletions

diff --git a/language-web/src/test/java/tools/refinery/language/web/ProblemWebInjectorProvider.java b/language-web/src/test/java/tools/refinery/language/web/ProblemWebInjectorProvider.java
new file mode 100644
index 00000000..2db4590e
--- /dev/null
+++ b/language-web/src/test/java/tools/refinery/language/web/ProblemWebInjectorProvider.java
@@ -0,0 +1,46 @@
+package tools.refinery.language.web;
+
+import org.eclipse.xtext.ide.ExecutorServiceProvider;
+import org.eclipse.xtext.util.DisposableRegistry;
+import org.eclipse.xtext.util.Modules2;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+import tools.refinery.language.ide.ProblemIdeModule;
+import tools.refinery.language.tests.ProblemInjectorProvider;
+import tools.refinery.language.web.xtext.servlet.AwaitTerminationExecutorServiceProvider;
+
+public class ProblemWebInjectorProvider extends ProblemInjectorProvider {
+
+        protected Injector internalCreateInjector() {
+                return new ProblemWebSetup() {
+                        @Override
+                        public Injector createInjector() {
+                                return Guice.createInjector(
+                                                Modules2.mixin(createRuntimeModule(), new ProblemIdeModule(), createWebModule()));
+                        }
+                }.createInjectorAndDoEMFRegistration();
+        }
+
+        protected ProblemWebModule createWebModule() {
+                // Await termination of the executor service to avoid race conditions between
+                // the tasks in the service and the {@link
+                // org.eclipse.xtext.testing.extensions.InjectionExtension}.
+                return new ProblemWebModule() {
+                        @SuppressWarnings("unused")
+                        public Class<? extends ExecutorServiceProvider> bindExecutorServiceProvider() {
+                                return AwaitTerminationExecutorServiceProvider.class;
+                        }
+                };
+        }
+
+        @Override
+        public void restoreRegistry() {
+                // Also make sure to dispose any IDisposable instances (that may depend on the
+                // global state) created by Xtext before restoring the global state.
+                var disposableRegistry = getInjector().getInstance(DisposableRegistry.class);
+                disposableRegistry.dispose();
+                super.restoreRegistry();
+        }
+}