fix test

2 files changed, 6 insertions, 2 deletions

diff --git a/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/LoadAllStrategyTestModel1.java b/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/LoadAllStrategyTestModel1.java
index fd83de918bf..17e8a7f07a9 100644
--- a/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/LoadAllStrategyTestModel1.java
+++ b/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/LoadAllStrategyTestModel1.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.papyrus.core.utils.DiResourceSet;

+import org.eclipse.papyrus.core.utils.ProxyManager;

 import org.eclipse.papyrus.sashwindows.di.PageRef;

 import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

 

@@ -33,6 +34,7 @@ public class LoadAllStrategyTestModel1 extends TestCase {
 	@Override

 	protected void setUp() throws Exception {

 		super.setUp();

+		ProxyManager.setCurrentStrategy(0);

 		diResourceSet = new DiResourceSet();

 		String path = resourceUri + "model1";

 		URI diUri = URI.createPlatformPluginURI(path + ".di", false);

@@ -75,8 +77,8 @@ public class LoadAllStrategyTestModel1 extends TestCase {
 				SashWindowsMngr sashWindowMngr = (SashWindowsMngr)eObject;

 				for (PageRef pageRef : sashWindowMngr.getPageList().getAvailablePage()) {

 					if (pageRef.getEmfPageIdentifier() != null && pageRef.getEmfPageIdentifier().toString().endsWith(fragment)) {

-						URI uriDiagram2 = URI.createPlatformPluginURI(pageRef.getEmfPageIdentifier().toString(), false);

-						assertEquals("Load diagram from page ref", uriDiagram, uriDiagram2);

+//						URI uriDiagram2 = URI.createPlatformPluginURI(pageRef.getEmfPageIdentifier().toString(), false);

+						assertEquals("Load diagram from page ref", diagram, pageRef.getEmfPageIdentifier());

 					}

 				}

 			}

diff --git a/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/LoadAllStrategyTestModel2.java b/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/LoadAllStrategyTestModel2.java
index bd7d0eee11f..adf5ba2e9cb 100644
--- a/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/LoadAllStrategyTestModel2.java
+++ b/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/LoadAllStrategyTestModel2.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.papyrus.core.utils.DiResourceSet;

+import org.eclipse.papyrus.core.utils.ProxyManager;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Type;

 

@@ -34,6 +35,7 @@ public class LoadAllStrategyTestModel2 extends TestCase {
 	@Override

 	protected void setUp() throws Exception {

 		super.setUp();

+		ProxyManager.setCurrentStrategy(0);

 		diResourceSet = new DiResourceSet();

 		String path = resourceUri + "Package0";

 		URI diUri = URI.createPlatformPluginURI(path + ".di", false);