[#608] make sure that WrappingInjectorProvider records changes to the…

… global registry even if the delegate itself is a IRegistryConfigurator and its injector is already created so that createInjector does not do anything that could be recorded Signed-off-by: Christian Dietrich <[email protected]>
eclipse · Jan 15, 2018 · 4f10ab7 · 4f10ab7
1 parent 4519cb8
commit 4f10ab7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...xt.testing/src/org/eclipse/xtext/testing/smoketest/internal/WrappingInjectorProvider.java b/...xt.testing/src/org/eclipse/xtext/testing/smoketest/internal/WrappingInjectorProvider.java
@@ -45,8 +45,14 @@ public WrappingInjectorProvider(IInjectorProvider delegate) {
 		this.delegate = delegate;
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		this.injector = createInjector();
+		if (delegate instanceof IRegistryConfigurator) {
+			((IRegistryConfigurator) delegate).setupRegistry();
+		}
 		registerFactory(injector);
 		stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+		if (delegate instanceof IRegistryConfigurator) {
+			((IRegistryConfigurator) delegate).restoreRegistry();
+		}
 	}
 
 	private void registerFactory(Injector injector) {