[445105] Use QVTbaseLibrary during tests

9 files changed, 72 insertions, 19 deletions

diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/QVTbasePivotStandaloneSetup.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/QVTbasePivotStandaloneSetup.java
index 73a5b5082..27ae4b6c7 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/QVTbasePivotStandaloneSetup.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/QVTbasePivotStandaloneSetup.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 import org.eclipse.ocl.pivot.utilities.PivotStandaloneSetup;
+import org.eclipse.qvtd.pivot.qvtbase.model.QVTbaseLibrary;
 import org.eclipse.qvtd.pivot.qvtbase.scoping.QVTbasePivotScoping;
 
 import com.google.inject.Guice;
@@ -34,6 +35,7 @@ public class QVTbasePivotStandaloneSetup //implements ISetup
 	}
 
 	public static void init() {
+		QVTbaseLibrary.lazyInstall();
 		PivotStandaloneSetup.doSetup();
 		QVTbasePivotScoping.init();
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/attributes/TransformationAttribution.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/attributes/TransformationAttribution.java
index 9dfd486f3..6024426b8 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/attributes/TransformationAttribution.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/attributes/TransformationAttribution.java
@@ -24,6 +24,9 @@ public class TransformationAttribution extends ClassAttribution
 
 	@Override
 	public ScopeView computeLookup(@NonNull EObject target, @NonNull EnvironmentView environmentView, @NonNull ScopeView scopeView) {
+		if ("modelFor".equals(environmentView.getName())) {
+			System.out.println("Got it");
+		}
 		Transformation transformation = (Transformation)target;
 		environmentView.addNamedElements(transformation.getModelParameter());
 		QVTbaseUtil.addAllNamedElements(environmentView, transformation.getOwnedOperations());
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbase.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbase.java
new file mode 100644
index 000000000..50377aa53
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbase.java
@@ -0,0 +1,26 @@
+package org.eclipse.qvtd.pivot.qvtbase.utilities;
+
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.internal.resource.ASResourceFactoryRegistry;
+import org.eclipse.ocl.pivot.internal.utilities.EnvironmentFactoryInternal;
+import org.eclipse.ocl.pivot.internal.utilities.OCLInternal;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
+import org.eclipse.qvtd.pivot.qvtbase.model.QVTbaseLibrary;
+
+public class QVTbase extends OCLInternal
+{	
+	public static @NonNull QVTbase newInstance(@NonNull ProjectManager projectManager, @Nullable ResourceSet externalResourceSet) {	
+		EnvironmentFactoryInternal environmentFactory = ASResourceFactoryRegistry.INSTANCE.createEnvironmentFactory(projectManager, externalResourceSet);
+		environmentFactory.getStandardLibrary().setDefaultStandardLibraryURI(QVTbaseLibrary.STDLIB_URI);
+		QVTbase qvt = new QVTbase(environmentFactory);
+		if (externalResourceSet != null) {
+			environmentFactory.adapt(externalResourceSet);
+		}
+		return qvt;
+	}
+	public QVTbase(@NonNull EnvironmentFactoryInternal environmentFactory) {
+		super(environmentFactory);
+	}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiEnvironmentFactory.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiEnvironmentFactory.java
index 8005adb8a..968ddf3e5 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiEnvironmentFactory.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiEnvironmentFactory.java
@@ -25,6 +25,7 @@ public class QVTiEnvironmentFactory extends AbstractEnvironmentFactory {
 
 	public QVTiEnvironmentFactory(@NonNull ProjectManager projectMap, @Nullable ResourceSet externalResourceSet) {
 		super(projectMap, externalResourceSet);
+//		getStandardLibrary().setDefaultStandardLibraryURI(QVTdStdlib.STDLIB_URI);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/utilities/QVTimperative.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/utilities/QVTimperative.java
new file mode 100644
index 000000000..45a5d4fca
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/utilities/QVTimperative.java
@@ -0,0 +1,17 @@
+package org.eclipse.qvtd.xtext.qvtimperative.utilities;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.qvtd.pivot.qvtbase.utilities.QVTbase;
+import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiEnvironmentFactory;
+
+public class QVTimperative extends QVTbase
+{
+	public QVTimperative(@NonNull QVTiEnvironmentFactory environmentFactory) {
+		super(environmentFactory);
+	}
+
+	@Override
+	public @NonNull QVTiEnvironmentFactory getEnvironmentFactory() {
+		return (QVTiEnvironmentFactory) super.getEnvironmentFactory();
+	}
+}
\ No newline at end of file
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 d0dcd97b9..734c9d62f 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
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtbase.tests
+Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtbase.tests;singleton:=true
 Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit;visibility:=reexport,
@@ -10,7 +10,7 @@ Require-Bundle: org.junit;visibility:=reexport,
  org.eclipse.uml2.uml.resources;visibility:=reexport,
  org.eclipse.ocl.xtext.oclstdlib;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.ocl.examples.xtext.tests;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.qvtd.pivot.qvtbase
+ org.eclipse.qvtd.pivot.qvtbase;bundle-version="[0.12.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/LoadTestCase.java b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/LoadTestCase.java
index e3379b825..3b7ee0a2e 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/LoadTestCase.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/LoadTestCase.java
@@ -23,6 +23,7 @@ import org.eclipse.ocl.pivot.internal.StandardLibraryImpl;
 import org.eclipse.ocl.pivot.internal.library.StandardLibraryContribution;
 import org.eclipse.ocl.pivot.utilities.OCL;
 import org.eclipse.ocl.xtext.base.utilities.BaseCSResource;
+import org.eclipse.qvtd.pivot.qvtbase.utilities.QVTbase;
 import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
 
 /**
@@ -31,7 +32,8 @@ import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil;
 public class LoadTestCase extends XtextTestCase
 {	
 	public void doLoad_Concrete(@NonNull String inputName) throws IOException {
-		OCL ocl = OCL.newInstance(OCL.NO_PROJECTS);
+		OCL ocl = QVTbase.newInstance(getProjectMap(), null);
+//		OCL ocl = OCL.newInstance(getProjectMap());
 		URI inputURI = getProjectFileURI(inputName);
 		URI pivotURI = inputURI.trimFileExtension().appendFileExtension("qvtias");
 		doLoad_Concrete(ocl, inputURI, pivotURI);
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 a2c18d1f7..b3cdb8976 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
@@ -25,7 +25,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.ocl.pivot.model.OCLstdlib;
-import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.ocl.pivot.utilities.ClassUtil;
 import org.eclipse.ocl.pivot.utilities.MetamodelManager;
 import org.eclipse.ocl.pivot.utilities.NameUtil;
@@ -45,6 +44,7 @@ import org.eclipse.qvtd.xtext.qvtimperative.QVTimperativeStandaloneSetup;
 import org.eclipse.qvtd.xtext.qvtimperative.tests.ManualUML2RDBMS.ManualRDBMSNormalizer;
 import org.eclipse.qvtd.xtext.qvtimperative.tests.SimpleUML2RDBMS.SimpleRDBMSNormalizer;
 import org.eclipse.qvtd.xtext.qvtimperative.utilities.QVTiXtextEvaluator;
+import org.eclipse.qvtd.xtext.qvtimperative.utilities.QVTimperative;
 import org.eclipse.xtext.util.EmfFormatter;
 import org.junit.Before;
 import org.junit.Test;
@@ -56,7 +56,7 @@ import org.junit.Test;
  */
 public class QVTiInterpreterTests extends LoadTestCase
 {
-	protected class MyQVT extends OCL
+	protected class MyQVT extends QVTimperative
 	{
 		public MyQVT(@NonNull QVTiEnvironmentFactory environmentFactory) {
 			super(environmentFactory);
@@ -65,19 +65,6 @@ public class QVTiInterpreterTests extends LoadTestCase
 		public @NonNull MyQvtiEvaluator createEvaluator(@NonNull String fileNamePrefix, @NonNull String transformationFileName) throws IOException {
 			return new MyQvtiEvaluator(getEnvironmentFactory(), fileNamePrefix, transformationFileName);
 		}
-
-		@Override
-		public @NonNull QVTiEnvironmentFactory getEnvironmentFactory() {
-			return (QVTiEnvironmentFactory) super.getEnvironmentFactory();
-		}
-	}
-	
-	protected static class MyQVTiEnvironmentFactory extends QVTiEnvironmentFactory
-	{
-		public MyQVTiEnvironmentFactory(@NonNull ProjectManager projectMap, @Nullable ResourceSet externalResourceSet) {
-			super(projectMap, externalResourceSet);
-	    	setEvaluationTracingEnabled(true);
-		}
 	}
 	
 	/**
@@ -206,7 +193,7 @@ public class QVTiInterpreterTests extends LoadTestCase
 	}
 
 	protected @NonNull MyQVT createQVT() {
-		return new MyQVT(new MyQVTiEnvironmentFactory(OCL.NO_PROJECTS, null));
+		return new MyQVT(new TestQVTiEnvironmentFactory(OCL.NO_PROJECTS, null));
 	}
 	
 	/* (non-Javadoc)
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/TestQVTiEnvironmentFactory.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/TestQVTiEnvironmentFactory.java
new file mode 100644
index 000000000..05ad1c734
--- /dev/null
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/TestQVTiEnvironmentFactory.java
@@ -0,0 +1,15 @@
+package org.eclipse.qvtd.xtext.qvtimperative.tests;
+
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
+import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiEnvironmentFactory;
+
+public class TestQVTiEnvironmentFactory extends QVTiEnvironmentFactory
+{
+	public TestQVTiEnvironmentFactory(@NonNull ProjectManager projectMap, @Nullable ResourceSet externalResourceSet) {
+		super(projectMap, externalResourceSet);
+    	setEvaluationTracingEnabled(true);
+	}
+}
\ No newline at end of file