Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptessier2014-03-20 20:53:54 -0400
committerptessier2014-03-20 20:53:54 -0400
commit57b3ccb356e9593d8c5e1269aae998649370eab4 (patch)
treeab9c4b0db484e07ca9470cb98c11ae4335213966 /tests/junit
parent2820a27700ac93f0c32c5a0bfee76deda71ada10 (diff)
parent3d7084c4af4fb9bb2f818f9e120524627cfef4f0 (diff)
downloadorg.eclipse.papyrus-57b3ccb356e9593d8c5e1269aae998649370eab4.tar.gz
org.eclipse.papyrus-57b3ccb356e9593d8c5e1269aae998649370eab4.tar.xz
org.eclipse.papyrus-57b3ccb356e9593d8c5e1269aae998649370eab4.zip
Merge branch 'master' of
ssh://ptessier@git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git Conflicts: tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AllTests.java
Diffstat (limited to 'tests/junit')
-rw-r--r--tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AllTests.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AllTests.java b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AllTests.java
index fade30448ad..fbf1504572d 100644
--- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AllTests.java
+++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AllTests.java
@@ -19,7 +19,8 @@ import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
@SuiteClasses({
-DeleteHandlerTest.class,
+ ModelExplorerViewTests.class,
+ DeleteHandlerTest.class,
ModelExplorerViewTests.class,
OpendiagramTest.class })
public class AllTests {

Back to the top