[unrelated] Fix test memory leaks
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/manager/MetaModelManager.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/manager/MetaModelManager.java
index 3ab8e54..1bd2dd7 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/manager/MetaModelManager.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/manager/MetaModelManager.java
@@ -1046,7 +1046,7 @@
/* @Override
protected void finalize() throws Throwable {
- System.out.println("Finalize " + getClass().getSimpleName() + "@" + Integer.toHexString(hashCode()));
+ System.out.println("Finalize " + PivotUtil.debugSimpleName(this));
super.finalize();
Set<MetaModelManager> keySet = liveMetaModelManagers.keySet();
if (!keySet.isEmpty()) {
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java
index 5a35072..dc1639a 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java
@@ -127,8 +127,8 @@
public void doRoundTripFromCompleteOCL(URI inputURI) throws IOException, InterruptedException {
MessageBinder savedMessageBinder = CS2Pivot.setMessageBinder(CS2Pivot.MessageBinderWithLineContext.INSTANCE);
+ ProjectMap projectMap = ProjectMap.getAdapter(resourceSet);
try {
- ProjectMap projectMap = ProjectMap.getAdapter(resourceSet);
projectMap.initializeResourceSet(null);
UMLUtils.initializeContentHandlers(resourceSet);
// String inputName = stem + ".ocl";
@@ -156,6 +156,7 @@
metaModelManager3.dispose();
}
finally {
+ projectMap.dispose();
CS2Pivot.setMessageBinder(savedMessageBinder);
}
}
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ValidateTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ValidateTests.java
index 7a126dd..8b4b931 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ValidateTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ValidateTests.java
@@ -34,6 +34,7 @@
import org.eclipse.ocl.examples.domain.values.impl.BagImpl;
import org.eclipse.ocl.examples.pivot.manager.MetaModelManager;
import org.eclipse.ocl.examples.pivot.manager.MetaModelManagerResourceAdapter;
+import org.eclipse.ocl.examples.pivot.manager.MetaModelManagerResourceSetAdapter;
import org.eclipse.ocl.examples.pivot.utilities.PivotDiagnostician;
import org.eclipse.ocl.examples.pivot.utilities.PivotEnvironmentFactory;
import org.eclipse.ocl.examples.xtext.base.utilities.BaseCSResource;
@@ -125,6 +126,7 @@
// Create model
//
Resource ecoreResource = doLoadOCLinEcore("Bug366229");
+ MetaModelManagerResourceSetAdapter.getAdapter(ecoreResource.getResourceSet(), metaModelManager);
EPackage overloadsPackage = (EPackage) ecoreResource.getContents().get(0);
EObject testInstance = eCreate(overloadsPackage, "SubClass");
//
@@ -191,6 +193,7 @@
// Create model
//
Resource ecoreResource = doLoadOCLinEcore("Validate");
+ MetaModelManagerResourceSetAdapter.getAdapter(ecoreResource.getResourceSet(), metaModelManager);
EPackage validatePackage = (EPackage) ecoreResource.getContents().get(0);
EObject testInstance = eCreate(validatePackage, "Level3");
eSet(testInstance, "ref", "ref");
