[unrelated] Fix not-saveability of Ecore ASResource
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 53026c3..9cee875 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
@@ -152,12 +152,13 @@
TestUtil.doCompleteOCLSetup();
URI oclURI = URI.createPlatformResourceURI("/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ocl", true);
// CompleteOCLEObjectValidator completeOCLEObjectValidator1 = new CompleteOCLEObjectValidator(QVTimperativePackage.eINSTANCE, oclURI, metamodelManager);
- CompleteOCLEObjectValidator completeOCLEObjectValidator2 = new CompleteOCLEObjectValidator(ClassUtil.nonNullState(QVTimperativePackage.eINSTANCE), oclURI, getEnvironmentFactory());
+ QVTiEnvironmentFactory environmentFactory = getEnvironmentFactory();
+ CompleteOCLEObjectValidator completeOCLEObjectValidator2 = new CompleteOCLEObjectValidator(ClassUtil.nonNullState(QVTimperativePackage.eINSTANCE), oclURI, environmentFactory);
// CompleteOCLEObjectValidator completeOCLEObjectValidator3 = new CompleteOCLEObjectValidator(QVTbasePackage.eINSTANCE, oclURI, metamodelManager);
// completeOCLEObjectValidator1.initialize();
- completeOCLEObjectValidator2.initialize();
+ completeOCLEObjectValidator2.initialize(environmentFactory);
// completeOCLEObjectValidator3.initialize();
- PivotEObjectValidator.install(ClassUtil.nonNullState(asResource.getResourceSet()), getEnvironmentFactory());
+ PivotEObjectValidator.install(ClassUtil.nonNullState(asResource.getResourceSet()), environmentFactory);
PivotEObjectValidator.install(ClassUtil.nonNullState(QVTbasePackage.eINSTANCE), null);
PivotEObjectValidator.install(ClassUtil.nonNullState(QVTcorePackage.eINSTANCE), null);
PivotEObjectValidator.install(ClassUtil.nonNullState(QVTimperativePackage.eINSTANCE), null);
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 75132c5..6d8cb86 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
@@ -42,6 +42,7 @@
import org.eclipse.ocl.pivot.internal.utilities.OCLInternal;
import org.eclipse.ocl.pivot.messages.StatusCodes;
import org.eclipse.ocl.pivot.model.OCLstdlib;
+import org.eclipse.ocl.pivot.resource.ASResource;
import org.eclipse.ocl.pivot.resource.ProjectManager;
import org.eclipse.ocl.pivot.utilities.OCL;
import org.eclipse.ocl.pivot.utilities.ThreadLocalExecutor;
@@ -784,8 +785,9 @@
assertNoValidationErrors("Ecore load", inputResource);
Ecore2AS ecore2as = Ecore2AS.getAdapter(inputResource, (EnvironmentFactoryInternal) ocl.getEnvironmentFactory());
Model pivotModel = ecore2as.getASModel();
- Resource asResource = pivotModel.eResource();
+ ASResource asResource = (ASResource) pivotModel.eResource();
asResource.setURI(asURI2a);
+ asResource.setSaveable(true);
assertNoResourceErrors("Ecore2AS failed", asResource);
asResource.save(XMIUtil.createSaveOptions());
assertValidationDiagnostics("Ecore2AS invalid", asResource, NO_MESSAGES);
@@ -864,8 +866,9 @@
assertNoValidationErrors("Ecore load", inputResource);
Ecore2AS ecore2as = Ecore2AS.getAdapter(inputResource, (EnvironmentFactoryInternal) ocl.getEnvironmentFactory());
Model pivotModel = ecore2as.getASModel();
- Resource asResource = pivotModel.eResource();
+ ASResource asResource = (ASResource) pivotModel.eResource();
asResource.setURI(asURI2a);
+ asResource.setSaveable(true);
assertNoResourceErrors("Ecore2AS failed", asResource);
asResource.save(XMIUtil.createSaveOptions());
assertValidationDiagnostics("Ecore2AS invalid", asResource, NO_MESSAGES);
