Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorCamille Letavernier2014-08-06 12:07:46 +0000
committerCamille Letavernier2014-08-06 12:07:46 +0000
commit4c867b768c9c46239ec862b53ee0df024496e4a6 (patch)
tree7c4f908e1b2b51b9c0e7efab5e8b1f86ad880e8d /tests
parentc307c5782066d30ee34688b7f5149e22ec373245 (diff)
downloadorg.eclipse.papyrus-4c867b768c9c46239ec862b53ee0df024496e4a6.tar.gz
org.eclipse.papyrus-4c867b768c9c46239ec862b53ee0df024496e4a6.tar.xz
org.eclipse.papyrus-4c867b768c9c46239ec862b53ee0df024496e4a6.zip
441246: [Tests] EditorReloadTest is conflicting with ResourceLoadingTest
https://bugs.eclipse.org/bugs/show_bug.cgi?id=441246 - Workaround: execute the ResourceLoadingTests after the EditorReloadTests
Diffstat (limited to 'tests')
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
index c7a885d0f3a..4f579440200 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
@@ -60,7 +60,6 @@ public class AllTests {
suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.core.tests.AllTests"));
suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.core.sasheditor.tests.AllTests"));
suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.infra.core.sasheditor.di", "org.eclipse.papyrus.infra.core.sasheditor.di.tests.AllTests"));
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.services.resourceloading.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.services.resourceloading.tests.AllTests"));
/* infra */
suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.tools.tests.AllTests.class));
@@ -80,6 +79,9 @@ public class AllTests {
/* integration */
suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.editor.integration.tests.AllTests.class));
+ //FIXME: Workaround for Bug 441246: Move the ResourceLoading tests after EditorReloadTest, since they are currently conflicting
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.services.resourceloading.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.services.resourceloading.tests.AllTests"));
+
/* search */
suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.search.tests.suites.AllTests.class));

Back to the top