[469571] Unify doXXXSetupI201711170647

22 files changed, 97 insertions, 139 deletions

diff --git a/tests/org.eclipse.qvtd.compiler.tests/src/org/eclipse/qvtd/compiler/tests/AnalysisTests.java b/tests/org.eclipse.qvtd.compiler.tests/src/org/eclipse/qvtd/compiler/tests/AnalysisTests.java
index 95a063b09..fb12bea5b 100644
--- a/tests/org.eclipse.qvtd.compiler.tests/src/org/eclipse/qvtd/compiler/tests/AnalysisTests.java
+++ b/tests/org.eclipse.qvtd.compiler.tests/src/org/eclipse/qvtd/compiler/tests/AnalysisTests.java
@@ -18,6 +18,7 @@ import java.util.Set;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.examples.xtext.tests.TestUtil;
 import org.eclipse.ocl.pivot.CompleteClass;
 import org.eclipse.ocl.pivot.CompleteModel;
 import org.eclipse.ocl.pivot.CompletePackage;
@@ -50,7 +51,7 @@ import org.eclipse.qvtd.pivot.qvtcore.Mapping;
 import org.eclipse.qvtd.pivot.qvtcore.analysis.QVTcoreDomainUsageAnalysis;
 import org.eclipse.qvtd.pivot.qvtcore.utilities.QVTcoreUtil;
 import org.eclipse.qvtd.xtext.qvtbase.tests.XtextTestCase;
-import org.eclipse.qvtd.xtext.qvtcore.tests.QVTcTestUtil;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 import org.junit.Test;
 
 import com.google.common.collect.Lists;
@@ -286,8 +287,8 @@ public class AnalysisTests extends XtextTestCase
 
 	@Test
 	public void testOperationDependencyAnalysis_Companies() throws ParserException {
-		QVTcTestUtil.doCompleteOCLSetup();
-		QVTcTestUtil.doQVTcoreSetup();
+		TestUtil.doCompleteOCLSetup();
+		XtextCompilerUtil.doQVTcoreSetup();
 		OCLInternal ocl = OCLInternal.newInstance();
 		EnvironmentFactoryInternal environmentFactory = ocl.getEnvironmentFactory();
 		//
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
index 05e23811a..98052dbb0 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
@@ -60,8 +60,7 @@ import org.eclipse.qvtd.runtime.evaluation.TransformationExecutor;
 import org.eclipse.qvtd.runtime.evaluation.Transformer;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
-import org.eclipse.qvtd.xtext.qvtcore.tests.QVTcTestUtil;
-import org.eclipse.qvtd.xtext.qvtimperative.tests.QVTiTestUtil;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 import org.eclipse.qvtd.xtext.qvtimperativecs.QVTimperativeCSPackage;
 import org.eclipse.xtext.resource.XtextResource;
 import org.junit.After;
@@ -286,8 +285,8 @@ public class OCL2QVTiTestCases extends LoadTestCase
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
-		QVTiTestUtil.doQVTimperativeSetup(); // To be able to add QVTimperative.ocl validation
-		QVTcTestUtil.doQVTcoreSetup();
+		XtextCompilerUtil.doQVTimperativeSetup(); // To be able to add QVTimperative.ocl validation
+		XtextCompilerUtil.doQVTcoreSetup();
 		TestUtil.doCompleteOCLSetup();
 	}
 
diff --git a/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXCompilerTests.java b/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXCompilerTests.java
index daa219902..ffe483762 100644
--- a/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXCompilerTests.java
+++ b/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXCompilerTests.java
@@ -45,9 +45,6 @@ import org.eclipse.qvtd.xtext.qvtbase.tests.AbstractTestQVT;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
-import org.eclipse.qvtd.xtext.qvtcore.tests.QVTcTestUtil;
-import org.eclipse.qvtd.xtext.qvtimperative.tests.QVTiTestUtil;
-import org.eclipse.qvtd.xtext.qvtrelation.tests.QVTrTestUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -192,9 +189,9 @@ public class UMLXCompilerTests extends LoadTestCase
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			UMLXStandaloneSetup.doSetup();
 		}
-		QVTrTestUtil.doQVTrelationSetup();
-		QVTcTestUtil.doQVTcoreSetup();
-		QVTiTestUtil.doQVTimperativeSetup();
+		XtextCompilerUtil.doQVTrelationSetup();
+		XtextCompilerUtil.doQVTcoreSetup();
+		XtextCompilerUtil.doQVTimperativeSetup();
 		//		QVTrelationPivotStandaloneSetup.doSetup();
 		//		QVTimperativePivotStandaloneSetup.doSetup();
 	}
diff --git a/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXSerializeTests.java b/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXSerializeTests.java
index 56123463e..477fe4444 100644
--- a/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXSerializeTests.java
+++ b/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXSerializeTests.java
@@ -55,7 +55,7 @@ import org.eclipse.qvtd.umlx.umlx2qvtr.UMLX2QVTr;
 import org.eclipse.qvtd.umlx.utilities.UMLXStandaloneSetup;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
-import org.eclipse.qvtd.xtext.qvtrelation.tests.QVTrTestUtil;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 
 import com.google.common.collect.Lists;
 
@@ -275,7 +275,7 @@ public class UMLXSerializeTests extends LoadTestCase
 
 	@Override
 	protected void setUp() throws Exception {
-		QVTrTestUtil.doQVTrelationSetup();
+		XtextCompilerUtil.doQVTrelationSetup();
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			UMLXStandaloneSetup.doSetup();
 		}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF
index 26eca4f68..5ecdcedca 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,9 @@ Require-Bundle: org.junit;visibility:=reexport,
  org.eclipse.ocl.xtext.oclstdlib;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.ocl.examples.xtext.tests;bundle-version="[3.9.0,3.10.0)";visibility:=reexport,
  org.eclipse.qvtd.compiler;bundle-version="[0.15.0,1.0.0)";visibility:=reexport,
- org.eclipse.qvtd.xtext.qvtimperative;bundle-version="[0.15.0,1.0.0)"
+ org.eclipse.qvtd.xtext.qvtimperative;bundle-version="[0.15.0,1.0.0)",
+ org.eclipse.qvtd.xtext.qvtcore;bundle-version="[0.15.0,1.0.0)",
+ org.eclipse.qvtd.xtext.qvtrelation;bundle-version="[0.15.0,1.0.0)"
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.qvtd.xtext.qvtbase.tests,
diff --git a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/utilities/XtextCompilerUtil.java b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/utilities/XtextCompilerUtil.java
index b07ff61b5..1c728983e 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/utilities/XtextCompilerUtil.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/utilities/XtextCompilerUtil.java
@@ -14,6 +14,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
@@ -37,10 +38,19 @@ import org.eclipse.qvtd.pivot.qvtcore.utilities.QVTcoreUtil;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel;
 import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperative;
 import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperativeUtil;
+import org.eclipse.qvtd.pivot.qvtschedule.QVTschedulePivotStandaloneSetup;
+import org.eclipse.qvtd.xtext.qvtcore.QVTcoreRuntimeModule;
+import org.eclipse.qvtd.xtext.qvtcore.QVTcoreStandaloneSetup;
+import org.eclipse.qvtd.xtext.qvtimperative.QVTimperativeRuntimeModule;
+import org.eclipse.qvtd.xtext.qvtimperative.QVTimperativeStandaloneSetup;
+import org.eclipse.qvtd.xtext.qvtrelation.QVTrelationRuntimeModule;
+import org.eclipse.qvtd.xtext.qvtrelation.QVTrelationStandaloneSetup;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.XtextResource;
 
+import com.google.inject.Guice;
+
 public class XtextCompilerUtil extends CompilerUtil
 {
 	public static void assertNoDiagnosticErrors(String message, XtextResource xtextResource) {
@@ -100,6 +110,21 @@ public class XtextCompilerUtil extends CompilerUtil
 		assertNoResourceErrors("Core Load", cResource2);
 	}
 
+	/**
+	 * Perform the appropriate initialization to support QVTcore parsing and editing using Xtext.
+	 * NB. This must be called before setUp() creates a GlobalStateMemento if the aggressive DEBUG_GC
+	 * garbage collection is enabled.
+	 */
+	public static void doQVTcoreSetup() {
+		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
+			QVTcoreStandaloneSetup.doSetup();
+			QVTschedulePivotStandaloneSetup.doSetup();
+		}
+		else {
+			Guice.createInjector(new QVTcoreRuntimeModule());
+		}
+	}
+
 	public static void doQVTiSerializeAndLoad(@NonNull ProjectManager projectManager, @NonNull URI inputURI, @NonNull URI serializedURI) throws IOException {
 		/*XtextResource csResource =*/ doSerialize(projectManager, inputURI, serializedURI);
 		QVTimperative qvti = QVTimperative.newInstance(projectManager, null);
@@ -107,6 +132,34 @@ public class XtextCompilerUtil extends CompilerUtil
 		assertNoResourceErrors("IMperative Load", iResource2);
 	}
 
+	/**
+	 * Perform the appropriate initialization to support QVTimperative parsing and editing using Xtext.
+	 * NB. This must be called before setUp() creates a GlobalStateMemento if the aggressive DEBUG_GC
+	 * garbage collection is enabled.
+	 */
+	public static void doQVTimperativeSetup() {
+    	if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
+    		QVTimperativeStandaloneSetup.doSetup();
+    	}
+    	else {
+    		Guice.createInjector(new QVTimperativeRuntimeModule());
+    	}
+	}
+	
+	/**
+	 * Perform the appropriate initialization to support QVTrelation parsing and editing using Xtext.
+	 * NB. This must be called before setUp() creates a GlobalStateMemento if the aggressive DEBUG_GC
+	 * garbage collection is enabled.
+	 */
+	public static void doQVTrelationSetup() {
+    	if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
+    		QVTrelationStandaloneSetup.doSetup();
+    	}
+    	else {
+    		Guice.createInjector(new QVTrelationRuntimeModule());
+    	}
+	}
+
 	private static XtextResource doSerialize(@NonNull ProjectManager projectManager, @NonNull URI inputURI, @NonNull URI serializedURI) throws IOException {
 		ResourceSet resourceSet = new ResourceSetImpl();
 		//
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java
index d0e9a6ef0..6dec65919 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java
@@ -42,6 +42,7 @@ import org.eclipse.qvtd.pivot.qvtschedule.utilities.QVTscheduleConstants;
 import org.eclipse.qvtd.runtime.evaluation.Transformer;
 import org.eclipse.qvtd.xtext.qvtbase.tests.AbstractTestQVT;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 import org.eclipse.qvtd.xtext.qvtcore.tests.families2persons.Families.FamiliesPackage;
 import org.eclipse.qvtd.xtext.qvtcore.tests.families2persons.Families2Persons.Families2PersonsPackage;
 import org.eclipse.qvtd.xtext.qvtcore.tests.families2persons.Persons.PersonsPackage;
@@ -53,7 +54,6 @@ import org.eclipse.qvtd.xtext.qvtcore.tests.list2list.list2list.List2listPackage
 import org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simplerdbms.SimplerdbmsPackage;
 import org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.SimpleumlPackage;
 import org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml2rdbms.Simpleuml2rdbmsPackage;
-import org.eclipse.qvtd.xtext.qvtimperative.tests.QVTiTestUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -144,8 +144,8 @@ public class QVTcCompilerTests extends LoadTestCase
 		QVTm2QVTs.DEBUG_GRAPHS.setState(true);
 		super.setUp();
 		OCLstdlib.install();
-		QVTcTestUtil.doQVTcoreSetup();
-		QVTiTestUtil.doQVTimperativeSetup();
+		XtextCompilerUtil.doQVTcoreSetup();
+		XtextCompilerUtil.doQVTimperativeSetup();
 		//		QVTcorePivotStandaloneSetup.doSetup();
 		//		QVTimperativePivotStandaloneSetup.doSetup();
 	}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java
index 5bd8389c6..ee6f279da 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java
@@ -15,6 +15,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.qvtd.pivot.qvtbase.Transformation;
 import org.eclipse.qvtd.pivot.qvtcore.analysis.QVTcoreDomainUsageAnalysis;
 import org.eclipse.qvtd.pivot.qvtcore.utilities.QVTcEnvironmentFactory;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 
 /**
  * Tests that demonstrate that the QVTcoreDomainUsageAnalysis analyzes everything.
@@ -29,7 +30,7 @@ public class QVTcDomainUsageTests extends AbstractDomainUsageTests
 	@Override
 	protected void setUp() throws Exception {
 		//		BaseLinkingService.DEBUG_RETRY.setState(true);
-		QVTcTestUtil.doQVTcoreSetup();
+		XtextCompilerUtil.doQVTcoreSetup();
 		super.setUp();
 	}
 
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcLoadTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcLoadTests.java
index 8dd7bac18..656656522 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcLoadTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcLoadTests.java
@@ -12,6 +12,7 @@ package org.eclipse.qvtd.xtext.qvtcore.tests;
 
 import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 
 /**
  * Tests that load a model and verify that there are no unresolved proxies as a result.
@@ -21,7 +22,7 @@ public class QVTcLoadTests extends LoadTestCase
 	@Override
 	protected void setUp() throws Exception {
 		BaseLinkingService.DEBUG_RETRY.setState(true);
-		QVTcTestUtil.doQVTcoreSetup();
+		XtextCompilerUtil.doQVTcoreSetup();
 		super.setUp();
 	}
 
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcSerializeTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcSerializeTests.java
index 9e1a64c90..61f22dcbe 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcSerializeTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcSerializeTests.java
@@ -25,6 +25,7 @@ import org.eclipse.qvtd.pivot.qvtcore.utilities.QVTcore;
 import org.eclipse.qvtd.xtext.qvtbase.tests.AbstractTestQVT;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 import org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage;
 import org.eclipse.xtext.resource.XtextResource;
 
@@ -100,7 +101,7 @@ public class QVTcSerializeTests extends LoadTestCase
 	@Override
 	public void setUp() throws Exception {
 		BaseLinkingService.DEBUG_RETRY.setState(true);
-		QVTcTestUtil.doQVTcoreSetup();
+		XtextCompilerUtil.doQVTcoreSetup();
 		super.setUp();
 	}
 
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcTestUtil.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcTestUtil.java
deleted file mode 100644
index 30a55dad5..000000000
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcTestUtil.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2017 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     E.D.Willink - initial API and implementation
- *******************************************************************************/
-package org.eclipse.qvtd.xtext.qvtcore.tests;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.ocl.examples.xtext.tests.TestUtil;
-import org.eclipse.qvtd.pivot.qvtschedule.QVTschedulePivotStandaloneSetup;
-import org.eclipse.qvtd.xtext.qvtcore.QVTcoreStandaloneSetup;
-
-import com.google.inject.Guice;
-
-public class QVTcTestUtil extends TestUtil
-{
-	/**
-	 * Perform the appropriate initialization to support QVTcore parsing and editing using Xtext.
-	 * NB. This must be called before setUp() creates a GlobalStateMemento if the aggressive DEBUG_GC
-	 * garbage collection is enabled.
-	 */
-	public static void doQVTcoreSetup() {
-		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
-			QVTcoreStandaloneSetup.doSetup();
-			QVTschedulePivotStandaloneSetup.doSetup();
-		}
-		else {
-			Guice.createInjector(new org.eclipse.qvtd.xtext.qvtcore.QVTcoreRuntimeModule());
-		}
-	}
-}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java
index bc0636d36..6007971de 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java
@@ -72,6 +72,8 @@ import org.eclipse.qvtd.runtime.internal.evaluation.ModificationMonitor;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
 import org.eclipse.qvtd.xtext.qvtbase.tests.ModelNormalizer;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
+
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
@@ -262,7 +264,7 @@ public class QVTiCompilerTests extends LoadTestCase
 		BaseLinkingService.DEBUG_RETRY.setState(true);
 		//		JavaFileUtil.CLASS_PATH.setState(true);
 		TestUtil.doCompleteOCLSetup();
-		QVTiTestUtil.doQVTimperativeSetup();
+		XtextCompilerUtil.doQVTimperativeSetup();
 		super.setUp();
 	}
 
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiEditorTests.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiEditorTests.java
index df7813869..fee7e95cf 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiEditorTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiEditorTests.java
@@ -17,6 +17,7 @@ import org.eclipse.ocl.pivot.utilities.OCL;
 import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
 import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperative;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 
 /**
  * Tests that load a model and verify that there are no unresolved proxies as a result.
@@ -35,7 +36,7 @@ public class QVTiEditorTests extends LoadTestCase
 	@Override
 	protected void setUp() throws Exception {
 		BaseLinkingService.DEBUG_RETRY.setState(true);
-		QVTiTestUtil.doQVTimperativeSetup();
+		XtextCompilerUtil.doQVTimperativeSetup();
 		super.setUp();
 	}
 	public void testLoad_HSV2HSL_qvti() throws Exception {
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java
index 8a5535cc9..93cfa97f9 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java
@@ -53,6 +53,7 @@ import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperativeUtil;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
 import org.eclipse.qvtd.xtext.qvtbase.tests.ModelNormalizer;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 import org.eclipse.xtext.util.EmfFormatter;
 import org.junit.Before;
 import org.junit.Test;
@@ -236,7 +237,7 @@ public class QVTiInterpreterTests extends LoadTestCase
 	@Before
 	public void setUp() throws Exception {
 		BaseLinkingService.DEBUG_RETRY.setState(true);
-		QVTiTestUtil.doQVTimperativeSetup();
+		XtextCompilerUtil.doQVTimperativeSetup();
 		super.setUp();
 	}
 
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiSerializeTests.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiSerializeTests.java
index 831116238..19a302d25 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiSerializeTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiSerializeTests.java
@@ -29,6 +29,7 @@ import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperative;
 import org.eclipse.qvtd.xtext.qvtbase.tests.AbstractTestQVT;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 import org.eclipse.qvtd.xtext.qvtimperativecs.QVTimperativeCSPackage;
 import org.eclipse.xtext.resource.XtextResource;
 
@@ -104,7 +105,7 @@ public class QVTiSerializeTests extends LoadTestCase
 	public void setUp() throws Exception {
 		BaseLinkingService.DEBUG_RETRY.setState(true);
 		TestUtil.doCompleteOCLSetup();
-		QVTiTestUtil.doQVTimperativeSetup();
+		XtextCompilerUtil.doQVTimperativeSetup();
 		super.setUp();
 	}
 
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiTestUtil.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiTestUtil.java
deleted file mode 100644
index 85e855328..000000000
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiTestUtil.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     E.D.Willink - initial API and implementation
- *******************************************************************************/
-package org.eclipse.qvtd.xtext.qvtimperative.tests;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.ocl.examples.xtext.tests.TestUtil;
-import org.eclipse.qvtd.xtext.qvtimperative.QVTimperativeStandaloneSetup;
-
-import com.google.inject.Guice;
-
-public class QVTiTestUtil extends TestUtil
-{
-	/**
-	 * Perform the appropriate initialization to support QVTimperative parsing and editing using Xtext.
-	 * NB. This must be called before setUp() creates a GlobalStateMemento if the aggressive DEBUG_GC
-	 * garbage collection is enabled.
-	 */
-	public static void doQVTimperativeSetup() {
-    	if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
-    		QVTimperativeStandaloneSetup.doSetup();
-    	}
-    	else {
-    		Guice.createInjector(new org.eclipse.qvtd.xtext.qvtimperative.QVTimperativeRuntimeModule());
-    	}
-	}
-}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTr2QVTrTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTr2QVTrTests.java
index c9b759be9..a939370a5 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTr2QVTrTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTr2QVTrTests.java
@@ -22,6 +22,7 @@ import org.eclipse.qvtd.pivot.qvtbase.Transformation;
 import org.eclipse.qvtd.pivot.qvtrelation.utilities.QVTrEnvironmentFactory;
 import org.eclipse.qvtd.pivot.qvtrelation.utilities.QVTrelationUtil;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 import org.eclipse.qvtd.xtext.qvtcore.tests.AbstractDomainUsageTests;
 
 /**
@@ -112,7 +113,7 @@ public class QVTr2QVTrTests extends AbstractDomainUsageTests
 	@Override
 	protected void setUp() throws Exception {
 		//		BaseLinkingService.DEBUG_RETRY.setState(true);
-		QVTrTestUtil.doQVTrelationSetup();
+		XtextCompilerUtil.doQVTrelationSetup();
 		super.setUp();
 	}
 
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
index 24ee0f7a4..86fadf849 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
@@ -54,8 +54,6 @@ import org.eclipse.qvtd.xtext.qvtbase.tests.AbstractTestQVT;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
-import org.eclipse.qvtd.xtext.qvtcore.tests.QVTcTestUtil;
-import org.eclipse.qvtd.xtext.qvtimperative.tests.QVTiTestUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -227,9 +225,9 @@ public class QVTrCompilerTests extends LoadTestCase
 		QVTm2QVTs.DEBUG_GRAPHS.setState(true);;
 		super.setUp();
 		OCLstdlib.install();
-		QVTrTestUtil.doQVTrelationSetup();
-		QVTcTestUtil.doQVTcoreSetup();
-		QVTiTestUtil.doQVTimperativeSetup();
+		XtextCompilerUtil.doQVTrelationSetup();
+		XtextCompilerUtil.doQVTcoreSetup();
+		XtextCompilerUtil.doQVTimperativeSetup();
 		//		QVTrelationPivotStandaloneSetup.doSetup();
 		//		QVTimperativePivotStandaloneSetup.doSetup();
 		ConnectivityChecker.CONNECTIVITY.setState(true);
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrDomainUsageTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrDomainUsageTests.java
index 0ba8fadbd..93678ae4f 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrDomainUsageTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrDomainUsageTests.java
@@ -15,6 +15,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.qvtd.compiler.internal.qvtr2qvtc.analysis.QVTrelationDomainUsageAnalysis;
 import org.eclipse.qvtd.pivot.qvtbase.Transformation;
 import org.eclipse.qvtd.pivot.qvtrelation.utilities.QVTrEnvironmentFactory;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 import org.eclipse.qvtd.xtext.qvtcore.tests.AbstractDomainUsageTests;
 
 /**
@@ -30,7 +31,7 @@ public class QVTrDomainUsageTests extends AbstractDomainUsageTests
 	@Override
 	protected void setUp() throws Exception {
 		//		BaseLinkingService.DEBUG_RETRY.setState(true);
-		QVTrTestUtil.doQVTrelationSetup();
+		XtextCompilerUtil.doQVTrelationSetup();
 		super.setUp();
 	}
 
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrLoadTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrLoadTests.java
index cdd451254..13f0b6949 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrLoadTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrLoadTests.java
@@ -21,6 +21,7 @@ import org.eclipse.ocl.pivot.utilities.OCL;
 import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
 import org.eclipse.qvtd.pivot.qvtbase.utilities.QVTbase;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 
 /**
  * Tests that load a model and verify that there are no unresolved proxies as a result.
@@ -61,7 +62,7 @@ public class QVTrLoadTests extends LoadTestCase
 	@Override
 	protected void setUp() throws Exception {
 		BaseLinkingService.DEBUG_RETRY.setState(true);
-		QVTrTestUtil.doQVTrelationSetup();
+		XtextCompilerUtil.doQVTrelationSetup();
 		super.setUp();
 		//		getProjectMap().
 		//		ProjectMap.getAdapter(resourceSet);
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrSerializeTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrSerializeTests.java
index 625cde067..6d21e8cb3 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrSerializeTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrSerializeTests.java
@@ -26,6 +26,7 @@ import org.eclipse.qvtd.pivot.qvtrelation.utilities.QVTrelation;
 import org.eclipse.qvtd.xtext.qvtbase.tests.AbstractTestQVT;
 import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
+import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.XtextCompilerUtil;
 import org.eclipse.qvtd.xtext.qvtrelationcs.QVTrelationCSPackage;
 import org.eclipse.xtext.resource.XtextResource;
 
@@ -136,7 +137,7 @@ public class QVTrSerializeTests extends LoadTestCase
 	@Override
 	public void setUp() throws Exception {
 		BaseLinkingService.DEBUG_RETRY.setState(true);
-		QVTrTestUtil.doQVTrelationSetup();
+		XtextCompilerUtil.doQVTrelationSetup();
 		super.setUp();
 	}
 
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrTestUtil.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrTestUtil.java
deleted file mode 100644
index dd54f3198..000000000
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrTestUtil.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     E.D.Willink - initial API and implementation
- *******************************************************************************/
-package org.eclipse.qvtd.xtext.qvtrelation.tests;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.ocl.examples.xtext.tests.TestUtil;
-import org.eclipse.qvtd.xtext.qvtrelation.QVTrelationStandaloneSetup;
-
-import com.google.inject.Guice;
-
-public class QVTrTestUtil extends TestUtil
-{
-	/**
-	 * Perform the appropriate initialization to support QVTrelation parsing and editing using Xtext.
-	 * NB. This must be called before setUp() creates a GlobalStateMemento if the aggressive DEBUG_GC
-	 * garbage collection is enabled.
-	 */
-	public static void doQVTrelationSetup() {
-    	if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
-    		QVTrelationStandaloneSetup.doSetup();
-    	}
-    	else {
-    		Guice.createInjector(new org.eclipse.qvtd.xtext.qvtrelation.QVTrelationRuntimeModule());
-    	}
-	}
-}