diff options
Diffstat (limited to 'tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext')
3 files changed, 20 insertions, 5 deletions
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/LoadTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/LoadTests.java index 6c52406e7..c9036109b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/LoadTests.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/LoadTests.java @@ -12,20 +12,37 @@ package org.eclipse.qvtd.xtext.qvtcore.tests; import java.io.IOException; +import org.eclipse.emf.common.EMFPlugin; import org.eclipse.ocl.xtext.base.services.BaseLinkingService; import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase; import org.eclipse.qvtd.xtext.qvtcore.QVTcoreStandaloneSetup; +import com.google.inject.Guice; + /** * Tests that load a model and verify that there are no unresolved proxies as a result. */ public class LoadTests extends LoadTestCase { + /** + * 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(); + } + else { + Guice.createInjector(new org.eclipse.qvtd.xtext.qvtcore.QVTcoreRuntimeModule()); + } + } + @Override protected void setUp() throws Exception { BaseLinkingService.DEBUG_RETRY.setState(true); + doQVTcoreSetup(); super.setUp(); - QVTcoreStandaloneSetup.doSetup(); } public void testLoad_expressions_qvtc() throws IOException, InterruptedException { 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 afd402da9..46080f4fd 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 @@ -49,7 +49,6 @@ import org.eclipse.qvtd.pivot.qvtcorebase.analysis.DomainUsage; import org.eclipse.qvtd.pivot.qvtcorebase.analysis.DomainUsageAnalysis; import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase; import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil; -import org.eclipse.qvtd.xtext.qvtcore.QVTcoreStandaloneSetup; /** * Tests that load a model and verify that there are no unresolved proxies as a result. @@ -156,8 +155,8 @@ public class QVTcDomainUsageTests extends LoadTestCase @Override protected void setUp() throws Exception { BaseLinkingService.DEBUG_RETRY.setState(true); + LoadTests.doQVTcoreSetup(); super.setUp(); - QVTcoreStandaloneSetup.doSetup(); } public Resource doLoad_ConcreteWithOCL(@NonNull MyQVT myQVT, @NonNull URI inputURI) throws IOException { 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 291bf759d..e34c8f849 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 @@ -28,7 +28,6 @@ import org.eclipse.ocl.pivot.utilities.PivotConstants; import org.eclipse.ocl.xtext.base.services.BaseLinkingService; import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase; import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil; -import org.eclipse.qvtd.xtext.qvtcore.QVTcoreStandaloneSetup; import org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage; import org.eclipse.xtext.resource.XtextResource; @@ -133,8 +132,8 @@ public class QVTcSerializeTests extends LoadTestCase @Override public void setUp() throws Exception { BaseLinkingService.DEBUG_RETRY.setState(true); + LoadTests.doQVTcoreSetup(); super.setUp(); - QVTcoreStandaloneSetup.doSetup(); } public void testSerialize_Class2RDBMS() throws Exception { |