summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjcadavid2014-05-16 13:21:23 (EDT)
committerjcadavid2014-05-16 13:42:25 (EDT)
commitd449f8fab8228bea8570f9fed2fc81344a3680d3 (patch)
treeb613072f24e20fd74b1f68bb0df1eccc31d50ce2
parentbb3ecdd3d7b067cfa582163e5762e03abd0d7883 (diff)
downloadorg.eclipse.papyrus-d449f8fab8228bea8570f9fed2fc81344a3680d3.zip
org.eclipse.papyrus-d449f8fab8228bea8570f9fed2fc81344a3680d3.tar.gz
org.eclipse.papyrus-d449f8fab8228bea8570f9fed2fc81344a3680d3.tar.bz2
Establish the resource loading strategy to the default in the @Beforerefs/changes/55/26755/1
fixture for the control mode tests. Signed-off-by: jcadavid <juan.cadavid@cea.fr>
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF3
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/AbstractControlModeTest.java5
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/uncontrol/AbstractUncontrolModelTest.java5
3 files changed, 10 insertions, 3 deletions
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
index a0e00ee..b093c51 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.106.0",
org.eclipse.uml2.uml;bundle-version="5.0.0",
org.eclipse.swtbot.eclipse.finder;bundle-version="2.2.1",
org.eclipse.swtbot.junit4_x;bundle-version="2.2.1",
- org.eclipse.emf.transaction
+ org.eclipse.emf.transaction,
+ org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.infra.services.controlmode.tests,
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/AbstractControlModeTest.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/AbstractControlModeTest.java
index cd3d9d2..70a0db2 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/AbstractControlModeTest.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/AbstractControlModeTest.java
@@ -24,7 +24,7 @@ import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.infra.core.lifecycleevents.ISaveAndDirtyService;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.services.controlmode.tests.Messages;
-import org.eclipse.papyrus.infra.services.controlmode.util.ControlHelper;
+import org.eclipse.papyrus.infra.services.resourceloading.preferences.StrategyChooser;
import org.eclipse.papyrus.junit.utils.EditorUtils;
import org.eclipse.papyrus.junit.utils.GenericUtils;
import org.eclipse.papyrus.junit.utils.HandlerUtils;
@@ -53,6 +53,9 @@ public abstract class AbstractControlModeTest extends AbstractPapyrusTest {
@Before
public void setUp() {
+ //Set the current resource loading strategy to the default
+ StrategyChooser.setCurrentStrategy(0);
+
try {
initTests(Activator.getDefault().getBundle());
} catch (CoreException e) {
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/uncontrol/AbstractUncontrolModelTest.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/uncontrol/AbstractUncontrolModelTest.java
index b79543c..a4476a3 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/uncontrol/AbstractUncontrolModelTest.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/uncontrol/AbstractUncontrolModelTest.java
@@ -24,7 +24,7 @@ import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.infra.core.lifecycleevents.ISaveAndDirtyService;
import org.eclipse.papyrus.infra.services.controlmode.tests.Messages;
import org.eclipse.papyrus.infra.services.controlmode.tests.control.Activator;
-import org.eclipse.papyrus.infra.services.controlmode.util.ControlHelper;
+import org.eclipse.papyrus.infra.services.resourceloading.preferences.StrategyChooser;
import org.eclipse.papyrus.junit.utils.EditorUtils;
import org.eclipse.papyrus.junit.utils.GenericUtils;
import org.eclipse.papyrus.junit.utils.HandlerUtils;
@@ -64,6 +64,9 @@ public abstract class AbstractUncontrolModelTest extends AbstractPapyrusTest {
@Before
public void setUp() {
+ //Set the current resource loading strategy to the default
+ StrategyChooser.setCurrentStrategy(0);
+
try {
initTests(Activator.getDefault().getBundle());
} catch (CoreException e) {